diff --git a/po/POTFILES.in b/po/POTFILES.in
index d758427e048392e94d84573ff1698edbe9093439..1bb86ce6e7502bea75bf1369922f091e1a4e2988 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,11 @@
-ui/ringgearsmenu.ui
 ui/help-overlay.ui
+ui/mainwindow.ui
 ui/accountmigrationview.ui
 ui/currentcallview.ui
 ui/accountcreationwizard.ui
+ui/gearsmenu.ui
 ui/generalsettingsview.ui
 ui/profile.ui
-ui/ringmainwindow.ui
 ui/mediasettingsview.ui
 ui/newaccountsettingsview.ui
 ui/usernameregistrationbox.ui
@@ -16,17 +16,17 @@ ui/incomingcallview.ui
 ui/avatarmanipulation.ui
 src/conversationsview.cpp
 src/mediasettingsview.cpp
-src/ring_client.cpp
-src/notifier.cpp
 src/marshals.cpp
 src/usernameregistrationbox.cpp
 src/generalsettingsview.cpp
 src/utils/files.cpp
 src/utils/drawing.cpp
 src/utils/models.cpp
+src/welcomeview.cpp
 src/models/gtkqtreemodel.cpp
 src/models/activeitemproxymodel.cpp
 src/models/gtkaccessproxymodel.cpp
+src/notifier.cpp
 src/video/video_widget.cpp
 src/video/xrectsel.c
 src/avatarmanipulation.cpp
@@ -34,17 +34,17 @@ src/dialogs.c
 src/messagingwidget.cpp
 src/cc-crop-area.c
 src/main.cpp
-src/ringmainwindow.cpp
 src/native/dbuserrorhandler.cpp
 src/native/pixbufmanipulator.cpp
+src/client_options.c
 src/incomingcallview.cpp
 src/conversationpopupmenu.cpp
 src/profileview.cpp
-src/ring_client_options.c
 src/accountcreationwizard.cpp
-src/ringwelcomeview.cpp
+src/mainwindow.cpp
 src/chatview.cpp
 src/webkitchatcontainer.cpp
+src/client.cpp
 src/accountmigrationview.cpp
 src/currentcallview.cpp
 src/newaccountsettingsview.cpp
diff --git a/po/ar.po b/po/ar.po
index 5efc9fd4fbef9754b7e39e00fa8355ae947411ee..964cfa6fe67bb973c55f7f0bd93be1fe268ace6c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/jami/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "عن RING"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "غادر"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "قائمة (menu)"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "عام"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "ميديا"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "حساب"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "إعدادات"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "محادثات"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "تسجيل"
 
@@ -369,11 +386,6 @@ msgstr "التالي"
 msgid "Profile"
 msgstr "خذ لمحة"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "حساب"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -381,7 +393,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr "موافق"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "عن RING"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "غادر"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "النظام"
@@ -536,30 +560,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "قائمة (menu)"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "عام"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "ميديا"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "إعدادات"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "محادثات"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -927,48 +927,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "اقبل"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "أرفض"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "رفض"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "اقبل"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "أرفض"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "رفض"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1072,7 +1068,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "مكالمة واردة"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "مسح السجل"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "فعل التصحيح"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "إستعداد الحالة المخفية للنافذة الرئيسية (تنطبق فقط على النموذج الأول)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "فعل التصحيح"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "إستعداد الحالة المخفية للنافذة الرئيسية (تنطبق فقط على النموذج الأول)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "حفظ الملف"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "مكالمة واردة"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "مسح السجل"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "توقف"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "أرسل"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "آلي"
diff --git a/po/bg.po b/po/bg.po
index eb4b28873536c5fdaaf42aa265e3d0887ec533ed..74e3146dca03b30051403d9bbcb60dde4c95cdc8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/jami/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Относно"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Изход"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Меню"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Общи"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Звук и видео"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Акаунт"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Настройки"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Разговори"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Заявки за нови контакти"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Записване"
 
@@ -369,11 +386,6 @@ msgstr "Напред"
 msgid "Profile"
 msgstr "Профил"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Акаунт"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -381,7 +393,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr "Добре"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Относно"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Изход"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Система"
@@ -536,30 +560,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Меню"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Общи"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Звук и видео"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Настройки"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Разговори"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Заявки за нови контакти"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Звукови настройки"
@@ -927,48 +927,6 @@ msgstr "Върни"
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Приемане"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Отказ"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Отказ"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Откажи"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Приемане"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Отказ"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Отказ"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr "Покажи разширена информация"
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Отваряне"
 
@@ -1072,7 +1068,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "започване на разговор"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "отваряне на чата"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Входящо обаждане"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Изчистване на историята"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Блокиране на контакт"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Възстановява скритото състояние на основния прозорец (това е приложимо само за първоначално изпълнената програма)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Възстановява скритото състояние на основния прозорец (това е приложимо само за първоначално изпълнената програма)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Паролите не съвпадат"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Запазване на файла"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "започване на разговор"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "отваряне на чата"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Входящо обаждане"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Изчистване на историята"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Блокиране на контакт"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Спиране"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Изпращане"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авт."
diff --git a/po/ca.po b/po/ca.po
index 7c8b33cd434aa62f0a3a456a16bcbcfe246496c3..cff6b0aa56d42fb8281ed16a697366d986cc7325 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/jami/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -22,18 +22,6 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Sobre"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Tanca"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -164,6 +152,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menú"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "General"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Mitjans"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Compte"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Opcions"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Converses"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Peticions de contacte"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Migració de compte requerida"
@@ -252,7 +269,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Grava"
 
@@ -371,11 +388,6 @@ msgstr "Següent"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Compte"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -383,7 +395,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -446,6 +458,18 @@ msgstr "D'acord"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Sobre"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Tanca"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -538,30 +562,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menú"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "General"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Mitjans"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Opcions"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Converses"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Peticions de contacte"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Preferències d'àudio"
@@ -929,48 +929,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accepta"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Rebutja"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rebutja"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1032,16 +990,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami és un programari lliure de comunicació universal, que respecta les llibertats i la privacitat dels seus usuaris."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accepta"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Rebutja"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rebutja"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1062,7 +1058,7 @@ msgstr "Mostra informació avançada"
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Obre"
 
@@ -1074,7 +1070,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1096,97 +1092,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "fer una trucada"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "obrir un xat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Trucada entrant"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Neteja historial"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1202,6 +1107,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Habilitar depuració"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaura l'estat ocult de la finestra principal (només s'aplica a la instància principal)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1246,20 +1165,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Habilitar depuració"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1286,7 +1191,7 @@ msgstr "No coincideixen les contrasenyes"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1307,51 +1212,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "fer una trucada"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "obrir un xat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Trucada entrant"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami és un programari lliure de comunicació universal, que respecta les llibertats i la privacitat dels seus usuaris."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Neteja historial"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Para"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Envia"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1359,7 +1359,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f649312a61309b3dacdf649bc190b31374f20e9d..8b152a52c463dfac263426d3b1f79fb3c387ebc9 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/jami/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,6 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_O programu"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Ukončit"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -163,6 +151,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Nabídka"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Obecné"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Média"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Účet"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Konverzace"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Žádosti o kontakt"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Je potřeba převedení účtu"
@@ -251,7 +268,7 @@ msgid "Toggle recording"
 msgstr "Přepnout nahrávání"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Nahrávat"
 
@@ -370,11 +387,6 @@ msgstr "Další"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Účet"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Zaregistrovat uživatelské jméno"
@@ -382,9 +394,9 @@ msgstr "Zaregistrovat uživatelské jméno"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Zaškrtnutím tohoto nastavení si zaregistrujete jedinečné uživatelské jméno na síti Jami. 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:625
 msgid ""
@@ -445,6 +457,18 @@ msgstr "Budiž"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_O programu"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Ukončit"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Systém"
@@ -537,30 +561,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Nabídka"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Obecné"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Média"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Nastavení"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Konverzace"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Žádosti o kontakt"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Nastavení zvuku"
@@ -928,48 +928,6 @@ msgstr "Zpět"
 msgid "Set selection as image"
 msgstr "Nastavit výběr jako obrázek"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Chyba Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Ukázat Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Ukončit"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Otevřít konverzaci"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Přijmout"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Odmítnout"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Nepřijmout"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1031,16 +989,54 @@ msgid "Choose download folder"
 msgstr "Vybrat složku pro stahování"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Zrušit"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Uložit"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Toto je vaše uživatelské jméno pro Jami.\nZkopírujte je a sdílejte je s vašimi přáteli!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Toto je vaše ID.\nZkopírujte je a sdílejte je s vašimi přáteli!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Otevřít konverzaci"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Přijmout"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmítnout"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Nepřijmout"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Sdílet část _obrazovky"
@@ -1061,7 +1057,7 @@ msgstr "Ukázat rozšířené informace"
 msgid "Open Avatar Image"
 msgstr "Otevřít profilový obrázek"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Otevřít"
 
@@ -1073,7 +1069,7 @@ msgstr "Pracuje…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1095,97 +1091,6 @@ msgstr "Zastavit nahrávání"
 msgid "Send recorded message"
 msgstr "Poslat nahranou zprávu"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Přidat účet…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "zavolat"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "otevřít zprávy"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Opustit stránku s nastavením"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "vám volá!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Příchozí hovor"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nová žádost od"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Žádosti o důvěru"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nová zpráva"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Vymazat historii"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokovat spojení"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1201,6 +1106,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Povolit ladění"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Obnoví skrytý stav hlavního okna (platí pouze pro primární instanci)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- klient GNOME pro Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Uskutečnit _obrazový hovor"
@@ -1245,20 +1164,6 @@ msgstr ""
 msgid "(None)"
 msgstr "(žádný)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Povolit ladění"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Obnoví skrytý stav hlavního okna (platí pouze pro primární instanci)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- klient GNOME pro Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1285,7 +1190,7 @@ msgstr "Hesla se neshodují"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Uložit soubor"
@@ -1306,51 +1211,146 @@ msgstr "Účet vyveden!"
 msgid "Export account failure."
 msgstr "Nepodařilo se vyvést účet."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Toto je vaše uživatelské jméno pro Jami.\nZkopírujte je a sdílejte je s vašimi přáteli!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Přidat účet…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Toto je vaše ID.\nZkopírujte je a sdílejte je s vašimi přáteli!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "zavolat"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "otevřít zprávy"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Opustit stránku s nastavením"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "vám volá!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Příchozí hovor"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nová žádost od"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Žádosti o důvěru"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nová zpráva"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Vymazat historii"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokovat spojení"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Poslat soubor"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Odeslat"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Chyba Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Ukázat Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Ukončit"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Varování! Tento krok povede k odstranění tohoto účtu na tomto zařízení?\nPoznámka: Tento krok nelze vrátit zpět. Vámi zaregistrované jméno může být ztraceno!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1358,7 +1358,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaticky"
diff --git a/po/da.po b/po/da.po
index 42ab2402d86c2e6973bf25297516dff26a101c0a..74b4d85d942217714d5b161279668bac84de758f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/jami/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,6 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Om"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Afslut"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -163,6 +151,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generelt"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medier"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Samtaler"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktforespørgsler"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Konto-migrering påkrævet"
@@ -251,7 +268,7 @@ msgid "Toggle recording"
 msgstr "Skift optagelse"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Optag"
 
@@ -370,11 +387,6 @@ msgstr "Næste"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrer brugernavn"
@@ -382,7 +394,7 @@ msgstr "Registrer brugernavn"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -445,6 +457,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Om"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Afslut"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -537,30 +561,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generelt"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medier"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Indstillinger"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Samtaler"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktforespørgsler"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Lyd-indstillinger"
@@ -928,48 +928,6 @@ msgstr "Returnér"
 msgid "Set selection as image"
 msgstr "Sæt markerede som billede"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Afslut"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Åbn samtale"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accepter"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Afvis"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Afvis"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registrer brugernavnet på navneserveren"
@@ -1031,16 +989,54 @@ msgid "Choose download folder"
 msgstr "Vælg downloadmappe"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annuller"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Gem"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Åbn samtale"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Afvis"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Afvis"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Del _skærmområde"
@@ -1061,7 +1057,7 @@ msgstr "Vis udvidet information"
 msgid "Open Avatar Image"
 msgstr "Åbn profilbillede"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -1073,9 +1069,9 @@ msgstr "Arbejder…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nbygget %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1095,97 +1091,6 @@ msgstr "Stop optagelse"
 msgid "Send recorded message"
 msgstr "Send optagede meddelelse"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Tilføj konto…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "foretag opkald"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "åbn chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Forlad indstillingsside"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr " kalder dig!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Indgående opkald"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Ny anmodning fra "
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Hav tillid til anmodning"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Ny besked"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Ryd historiken"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloker kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1201,6 +1106,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Aktiver fejlfinding"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Gendanner den skjulte tilstand fort hovedvinduer (kun gyldig for den primære instans)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Foretag _videoopkald"
@@ -1245,20 +1164,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Aktiver fejlfinding"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Gendanner den skjulte tilstand fort hovedvinduer (kun gyldig for den primære instans)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1285,7 +1190,7 @@ msgstr "Adgangskoderne er ikke ens"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Gem fil"
@@ -1306,51 +1211,146 @@ msgstr "Konto eksporteret!"
 msgid "Export account failure."
 msgstr "Eksport af konto mislykkedes."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Tilføj konto…"
+
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "foretag opkald"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "åbn chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Forlad indstillingsside"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr " kalder dig!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Indgående opkald"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Ny anmodning fra "
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Hav tillid til anmodning"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Ny besked"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Ryd historiken"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloker kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Send"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Afslut"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1358,7 +1358,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/de.po b/po/de.po
index 60ddecef04c81d69deae4b264a9a9d231524db2a..826dc2469357e50227020e11352026294f6fdb2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: German (http://www.transifex.com/savoirfairelinux/jami/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -35,18 +35,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Tastatur_Shortcuts"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Über Jami"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Beenden"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -177,6 +165,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "In neuer Zeile schreiben"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menü"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Allgemein"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medium"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Unterhaltungen"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktanfragen"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Kontomigration erforderlich"
@@ -265,7 +282,7 @@ msgid "Toggle recording"
 msgstr "Aufnahme umschalten"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Aufzeichnen"
 
@@ -384,11 +401,6 @@ msgstr "Weiter"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Benutzername registrieren"
@@ -396,9 +408,9 @@ msgstr "Benutzername registrieren"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Durch Setzen dieses Flags wird ein eindeutiger Benutzername im Jami-Netzwerk eingetragen. Andere Teilnehmer können sich über diesen Eintrag mit Ihnen verbinden, anstelle der Angabe der Ring-ID, welche 40 Zeichen umfasst."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -459,6 +471,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Einloggen"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Tastatur_Shortcuts"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Über Jami"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Beenden"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -551,30 +575,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR-Code"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menü"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Allgemein"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medium"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Unterhaltungen"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktanfragen"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Audioeinstellungen"
@@ -942,48 +942,6 @@ msgstr "Zurück"
 msgid "Set selection as image"
 msgstr "Auswahl als Bild benutzen"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Initialiierung fehlgeschlagen.\nÜberprüfen Sie, ob der Jami-Daemon (dring) läuft.\nFehler: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Fehler in Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Jami anzeigen"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Beenden"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Konversation öffnen"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Akzeptieren"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Verweigern"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Ablehnen"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Benutzername auf dem Nameserver registrieren"
@@ -1045,16 +1003,54 @@ msgid "Choose download folder"
 msgstr "Zielordner wählen"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Speichern"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Das ist Ihr Jami-Benutzername.\nKopieren und teilen Sie diesen mit Ihren Freunden!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Das ist Ihre Jami-ID.\nKopieren und teilen Sie diese mit Ihren Freunden!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Konversation öffnen"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Verweigern"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Ablehnen"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "_Bildschirmausschnitt teilen"
@@ -1075,7 +1071,7 @@ msgstr "Erweiterte Informationen anzeigen"
 msgid "Open Avatar Image"
 msgstr "Profilbild öffnen"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Öffnen"
 
@@ -1087,9 +1083,9 @@ msgstr "Wird ausgeführt..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nerstellt am %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1109,97 +1105,6 @@ msgstr "Aufnahme stoppen"
 msgid "Send recorded message"
 msgstr "Aufgenommene Nachricht senden"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Konto hinzufügen..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Anrufen"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Chat öffnen"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - Migration notwendig"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migration im Gange... Bitte nicht dieses Fenster schließen."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Suche oder starte eine Konversation"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Seite mit Einstellungen verlassen"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Es gibt aktive Anrufe"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "ruft Sie gerade an!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Neue Anfrage von"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Anfrage vertrauen"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Neue Nachricht"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Aktuellen Anruf beenden?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Ein Aufruf ist derzeit im Gange. Möchten Sie das Fenster schließen und alle aktuellen Anrufe stoppen?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Verlauf leeren"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Wollen Sie wirklich den Verlauf dieser Konversation löschen?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Konversation entfernen"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Wollen Sie wirklich diese Konversation löschen?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Kontakt blockieren"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Wollen Sie wirklich diesen Kontakt sperren?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1215,6 +1120,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Neuverbindung zum Jami-Daemon (dring) fehlgeschlagen.\nJami wird nun beendet."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Debugoption aktivieren"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Stellt den versteckten Zustand des Hauptfensters wieder her (nur für die Hauptinstanz möglich)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME-Client für Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Starte _Videoanruf"
@@ -1259,20 +1178,6 @@ msgstr "_Profil"
 msgid "(None)"
 msgstr "(Nichts)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Debugoption aktivieren"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "- GNOME-Client für Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Während der Kontoerstellung ist ein Fehler aufgetreten"
@@ -1299,7 +1204,7 @@ msgstr "Passwörter stimmen nicht überein"
 msgid "Import from backup"
 msgstr "Aus Backup importieren"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Datei speichern"
@@ -1320,51 +1225,146 @@ msgstr "Konto exportiert!"
 msgid "Export account failure."
 msgstr "Fehler beim Kontoexport."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Das ist Ihr Jami-Benutzername.\nKopieren und teilen Sie diesen mit Ihren Freunden!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Konto hinzufügen..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Das ist Ihre Jami-ID.\nKopieren und teilen Sie diese mit Ihren Freunden!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Anrufen"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Chat öffnen"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - Migration notwendig"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migration im Gange... Bitte nicht dieses Fenster schließen."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Suche oder starte eine Konversation"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Seite mit Einstellungen verlassen"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Es gibt aktive Anrufe"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "ruft Sie gerade an!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Neue Anfrage von"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Anfrage vertrauen"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Neue Nachricht"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Aktuellen Anruf beenden?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Ein Aufruf ist derzeit im Gange. Möchten Sie das Fenster schließen und alle aktuellen Anrufe stoppen?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Verlauf leeren"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Wollen Sie wirklich den Verlauf dieser Konversation löschen?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Konversation entfernen"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Wollen Sie wirklich diese Konversation löschen?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Kontakt blockieren"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Wollen Sie wirklich diesen Kontakt sperren?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Datei senden"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Senden"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Initialiierung fehlgeschlagen.\nÜberprüfen Sie, ob der Jami-Daemon (dring) läuft.\nFehler: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Fehler in Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Jami anzeigen"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Beenden"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Achtung! Diese Aktion entfernt dieses Konto von diesem Gerät!\nHinweis: Diese Aktion kann nicht rückgängig gemacht werden. Auch Ihr registrierter Benutzername kann verlorengehen!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatisch"
diff --git a/po/de_DE.po b/po/de_DE.po
index 1153ac33c4ea01165280d77313f1b31d6182384f..6a7d63f3958c7d997427bdfdacfb5538d0e95935 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/jami/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Über"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Beenden"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -165,6 +153,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menü"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Allgemein"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Gespräche"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktanfragen"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -253,7 +270,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Aufzeichnen"
 
@@ -372,11 +389,6 @@ msgstr "Weiter"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Benutzernamen registrieren"
@@ -384,9 +396,9 @@ msgstr "Benutzernamen registrieren"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Klicken Sie hier, um einen eindeutigen Benutzernamen im Jami-Netzwerk zu registrieren. Andere Nutzer können darüber mit Ihnen Kontakt aufnehmen, anstatt die 40 Zeichen lange RingID zu benutzen."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -447,6 +459,18 @@ msgstr "Okay"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Über"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Beenden"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -539,30 +563,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menü"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Allgemein"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Gespräche"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktanfragen"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Audio-Einstellungen"
@@ -930,48 +930,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami-Fehler"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Akzeptieren"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Ablehnen"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Ablehnen"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1033,16 +991,54 @@ msgid "Choose download folder"
 msgstr "Download-Ordner auswählen"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Dies ist Ihr Jami-Benutzername.\nKopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Dies ist Ihre ID.\nKopieren und teilen Sie sie mit Ihren Freunden!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Ablehnen"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Ablehnen"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1063,7 +1059,7 @@ msgstr "Weitere Informationen anzeigen"
 msgid "Open Avatar Image"
 msgstr "Avatar-Bild öffnen"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1075,7 +1071,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1097,97 +1093,6 @@ msgstr "Aufnahme beenden"
 msgid "Send recorded message"
 msgstr "Sprachnachricht senden"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Konto hinzufügen…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Einstellungen verlassen"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Eingehender Anruf"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Neue Nachricht"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Verlauf löschen"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Kontakt blockieren"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1203,6 +1108,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME-Client für Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Video-Anruf starten"
@@ -1247,20 +1166,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- GNOME-Client für Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1287,7 +1192,7 @@ msgstr "Passwörter stimmen nicht überein"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Datei speichern"
@@ -1308,51 +1213,146 @@ msgstr "Konto exportiert!"
 msgid "Export account failure."
 msgstr "Konto-Export fehlgeschlagen."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Dies ist Ihr Jami-Benutzername.\nKopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Konto hinzufügen…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Dies ist Ihre ID.\nKopieren und teilen Sie sie mit Ihren Freunden!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Einstellungen verlassen"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Eingehender Anruf"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Neue Nachricht"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Verlauf löschen"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Kontakt blockieren"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Datei senden"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Beenden"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Senden"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami-Fehler"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Warnung! Hiermit wird dieses Konto von diesem Gerät entfernt!\nDies kann nicht rückgängig gemacht werden. Darüber hinaus kann Ihr registrierter Benutzername verloren gehen!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1360,7 +1360,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 0b7cbc99be7604f4de7762b25c1fd37ad634a708..cfc731b4047981c13cd9689e040b8068bc1a5453 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/jami/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "Σχετικά"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "Έξοδος"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Μενού"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Γενικά"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Μέσα"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Λογαριασμός"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Συνομιλίες"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Αιτήματα επαφών"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Απαιτείται ενοποίηση λογαριασμού"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Εγγραφή"
 
@@ -369,11 +386,6 @@ msgstr "Επόμενο"
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Λογαριασμός"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -381,7 +393,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "Σχετικά"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "Έξοδος"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Σύστημα"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Μενού"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Γενικά"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Μέσα"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Συνομιλίες"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Αιτήματα επαφών"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Ρυθμίσεις ήχου"
@@ -927,48 +927,6 @@ msgstr "Επιστροφή"
 msgid "Set selection as image"
 msgstr "Καθορισμός επιλογής ως εικόνας"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Αποδοχή"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Άρνηση"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Απόρριψη κλήσης"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "Άκυρο"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Αποδοχή"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Άρνηση"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Απόρριψη κλήσης"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr "Εμφάνιση προχωρημένων πληροφοριών"
 msgid "Open Avatar Image"
 msgstr "Άνοιγμα εικόνας avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "Άνοιγμα"
 
@@ -1072,7 +1068,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "έναρξη κλήσης"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "άνοιγμα συνομιλίας"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Εισερχόμενη κλήση"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Ενεργοποίηση αποσφαλμάτωσης"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Επαναφέρει την κρυμένη κατάσταση του κύριου παραθύρου (εφαρμόζεται μόνο στο πρωταρχικό περιστατικό)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Ενεργοποίηση αποσφαλμάτωσης"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Επαναφέρει την κρυμένη κατάσταση του κύριου παραθύρου (εφαρμόζεται μόνο στο πρωταρχικό περιστατικό)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Τα συνθηματικά δεν ταιριάζουν"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Αποθήκευση αρχείου"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "έναρξη κλήσης"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "άνοιγμα συνομιλίας"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Εισερχόμενη κλήση"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Τερματισμός"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Αποστολή"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 423967315c14613861608145a72a41c8c4fb3c29..ef3a038cf531ec5c7ca0bb72e268b7b988a1d87f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/jami/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Pri"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Eliri"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menuo"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Ĝenerala"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Aŭdvidaĵo"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Agordoj"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Konversacioj"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Konta migrigo bezonata"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Registri"
 
@@ -369,11 +386,6 @@ msgstr "Sekva"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -381,7 +393,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr "Okej"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Pri"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Eliri"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistemo"
@@ -536,30 +560,6 @@ msgstr "Identigaĵo"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menuo"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Ĝenerala"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Aŭdvidaĵo"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Agordoj"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Konversacioj"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Aŭdiaj Agordoj"
@@ -927,48 +927,6 @@ msgstr "Reveni"
 msgid "Set selection as image"
 msgstr "Uzu elektaĵon kiel bildo"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Akcepti"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Rifuzi"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rifuzi"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Rezigni"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Akcepti"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifuzi"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rifuzi"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr "Montri specialajn informojn"
 msgid "Open Avatar Image"
 msgstr "Malfermi Profilbildon"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Malfermi"
 
@@ -1072,7 +1068,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "voki"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "malfermi babilejon"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Envena voko"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Vakigi historion"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Ŝalti sencimigon"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaŭras kaŝecon de la ĉefa fenestro (nur por la ĉefa ekzemplo)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Ŝalti sencimigon"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Restaŭras kaŝecon de la ĉefa fenestro (nur por la ĉefa ekzemplo)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Pasvortoj ne kongruas"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Konservi Dosieron"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "voki"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "malfermi babilejon"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Envena voko"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Vakigi historion"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stopi"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Sendi"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Aŭtomata"
diff --git a/po/es.po b/po/es.po
index 916e6cd501419ea0f620998e8e19f13c0df9c01f..b119b122ac023f87e4ef04dd47285b426b3864a2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/jami/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -48,18 +48,6 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Atajos de teclado"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Acerca de"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Salir"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -190,6 +178,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Escribir en una nueva línea"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menú"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "General"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medios"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Cuenta"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Configuración"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversaciones"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitudes de contacto"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Se necesita la migración de la cuenta"
@@ -278,7 +295,7 @@ msgid "Toggle recording"
 msgstr "Alternar grabación"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Grabar"
 
@@ -397,11 +414,6 @@ msgstr "Siguiente"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Cuenta"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrar nombre de usuario"
@@ -409,9 +421,9 @@ msgstr "Registrar nombre de usuario"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Al marcar aquí, estarás registrando un nombre de usuario único en la red de Jami. Otras personas podrán utilizarlo para llamarte sin tener que utilizar tu identificador RingID, que tiene 40 caracteres."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -472,6 +484,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Atajos de teclado"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Acerca de"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Salir"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -564,30 +588,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menú"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "General"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medios"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Configuración"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitudes de contacto"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Configuración de audio"
@@ -955,48 +955,6 @@ msgstr "Volver"
 msgid "Set selection as image"
 msgstr "Establecer la selección como imagen"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Incapaz de inicializar.\nAsegurese que el demonio de Jami (dring) esté funcionando.\nError: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Error en Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostrar Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Salir"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Conversación abierta"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aceptar"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "No aceptar"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rechazar"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registre el nombre de usuario en el servidor de nombres"
@@ -1058,16 +1016,54 @@ msgid "Choose download folder"
 msgstr "Elegir la carpeta de descargas"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Guardar"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Este es tu nombre de usuario en Jami.\n¡Cópialo y compártelo con tus amigos!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Este es tu ID.\n¡Cópialo y compártelo con tus amigos!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami es software libre para la comunicación universal que respeta las libertades y la privacidad de sus usuarios."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Conversación abierta"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aceptar"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "No aceptar"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rechazar"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Compartir el área de _pantalla"
@@ -1088,7 +1084,7 @@ msgstr "Mostrar información avanzada"
 msgid "Open Avatar Image"
 msgstr "Abrir imagen de avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1100,9 +1096,9 @@ msgstr "Procesando..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nintegrado en %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1122,97 +1118,6 @@ msgstr "Detener la grabación"
 msgid "Send recorded message"
 msgstr "Enviar mensaje grabado"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Añadir cuenta..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "llamar"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Abrir chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Abandonar la página de configuración"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Hay llamadas activas"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "te está llamando."
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Llamada entrante"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nueva petición de"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Solicitud de confianza"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nuevo mensaje"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "¿Finalizar llamada actual?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Una llamada está activa. ¿Quiere cerrar la ventana y finalizar todas las llamadas que se están llevando a cabo?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Limpiar historial"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "¿Desea eliminar el historial de esta conversación?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Eliminar conversación"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "¿Desea eliminar esta conversación?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloquear contacto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "¿Desea bloquear este contacto?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1228,6 +1133,20 @@ msgid ""
 "Jami will now quit."
 msgstr "No se pudo volver a conectar con el demonio Jami (dring).\nJami ahora se cerrará."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Habilitar depuración"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaura el estado de ocultación de la ventana principal (únicamente la primera vez)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Cliente Gnome para Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Hacer una _videoconferencia"
@@ -1272,20 +1191,6 @@ msgstr ""
 msgid "(None)"
 msgstr "(Nada)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Habilitar depuración"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "- Cliente Gnome para Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1312,7 +1217,7 @@ msgstr "Las contraseñas no coinciden"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Guardar fichero"
@@ -1333,51 +1238,146 @@ msgstr "¡Cuenta exportada!"
 msgid "Export account failure."
 msgstr "Fallo al exportar la cuenta."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Este es tu nombre de usuario en Jami.\n¡Cópialo y compártelo con tus amigos!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Añadir cuenta..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Este es tu ID.\n¡Cópialo y compártelo con tus amigos!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "llamar"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Abrir chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Abandonar la página de configuración"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Hay llamadas activas"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "te está llamando."
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nueva petición de"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Solicitud de confianza"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nuevo mensaje"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "¿Finalizar llamada actual?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami es software libre para la comunicación universal que respeta las libertades y la privacidad de sus usuarios."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Una llamada está activa. ¿Quiere cerrar la ventana y finalizar todas las llamadas que se están llevando a cabo?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Limpiar historial"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "¿Desea eliminar el historial de esta conversación?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Eliminar conversación"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "¿Desea eliminar esta conversación?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloquear contacto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "¿Desea bloquear este contacto?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Reintentar"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Parar"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Enviar"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Incapaz de inicializar.\nAsegurese que el demonio de Jami (dring) esté funcionando.\nError: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Error en Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostrar Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Salir"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1385,7 +1385,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/es_AR.po b/po/es_AR.po
index d12b535b439176b4a89047db2f0f0520a12dfff6..f0d90573c3e35c8bb7185e3b6e1f4d93248f7805 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/jami/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "General"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medios"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Cuenta"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ajustes"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversaciones"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitudes de contacto"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Micración de cuenta requerida"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Grabar"
 
@@ -367,11 +384,6 @@ msgstr "Siguiente"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Cuenta"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr "Ok"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "General"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medios"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ajustes"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitudes de contacto"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aceptar"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Rechazar"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rechazar"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aceptar"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Rechazar"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rechazar"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Llamada entrante"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Borrar historial"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Llamada entrante"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Borrar historial"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Enviar"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 09af791b385a70420bbe62d129b59ea4716c8313..612a5ad92569e4bfb350f2a24ff4a19f080b4876 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/jami/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Kendu"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Orokorra"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Multimedia"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Kontua"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Elkarrizketak"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktu eskariak"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -367,11 +384,6 @@ msgstr "Hurengoa"
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Kontua"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr "Ados"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Kendu"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Orokorra"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Multimedia"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ezarpenak"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Elkarrizketak"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktu eskariak"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Onartu"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Ukatu"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Ukatu"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami komunikazio unibertsalerako software librea da, erabiltzaileek askatasunak eta pribatutasuna aintzat hartzen dituena"
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Onartu"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Ukatu"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Ukatu"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Sarrera-deia"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Garbitu historiala"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokeatu kontaktua"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Sarrera-deia"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami komunikazio unibertsalerako software librea da, erabiltzaileek askatasunak eta pribatutasuna aintzat hartzen dituena"
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Garbitu historiala"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokeatu kontaktua"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Bidali"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/fa_IR.po b/po/fa_IR.po
index b51f7728d4d8969571fe21ac5c97f366e9369ba9..cbfdf058c2d9d74f2755101c52b9768dee83bae0 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/jami/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_درباره"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_خروج"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -165,6 +153,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "منو"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "همگانی"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "رسانه"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "حساب کاربری"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr " گفتگو"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "درخواست‌های تماس"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "نیاز به جابجایی حساب کاربری"
@@ -253,7 +270,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "ضبط"
 
@@ -372,11 +389,6 @@ msgstr "بعدی"
 msgid "Profile"
 msgstr "نمایه"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "حساب کاربری"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "ثبت نام کاربری"
@@ -384,7 +396,7 @@ msgstr "ثبت نام کاربری"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -447,6 +459,18 @@ msgstr "خب"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_درباره"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_خروج"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "سیستم"
@@ -539,30 +563,6 @@ msgstr "شناسه"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "منو"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "همگانی"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "رسانه"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "تنظیمات"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr " گفتگو"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "درخواست‌های تماس"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "تنظیمات صوت"
@@ -930,48 +930,6 @@ msgstr "بازگشت"
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "خطای جمی"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "نمایش جمی"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "خروج"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "باز کردن مکالمه"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "قبول"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "رد"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "رد کردن"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1033,16 +991,54 @@ msgid "Choose download folder"
 msgstr "انتخاب پوشه دانلود"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_لغو"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_ذخیره"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "جمی نرم‌افزار آزاد برای ارتباط جهانی است که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "باز کردن مکالمه"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "قبول"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "رد"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "رد کردن"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1063,7 +1059,7 @@ msgstr "نمایش اطّلاعات پیشرفته"
 msgid "Open Avatar Image"
 msgstr "گشودن تصویر آواتار"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_گشودن"
 
@@ -1075,7 +1071,7 @@ msgstr "در حال کار..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1097,97 +1093,6 @@ msgstr "توقف ضبط"
 msgid "Send recorded message"
 msgstr "ارسال پیام ضبط شده"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "افزودن حساب..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "گشودن گپ"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "خروج از صفحهٔ تنظیمات"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "تماس ورودی"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "درخواست جدید از جانب"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "درخواست اعتماد"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "پیام جدید"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "پاک‌سازی تاریخچه"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "مسدودسازی مخاطب"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1203,6 +1108,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "فعال کردن خطایابی"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "قراردهی _تماس ویدیویی"
@@ -1247,20 +1166,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "فعال کردن خطایابی"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1287,7 +1192,7 @@ msgstr "گذرواژه‌ها یکسان نیستند"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "ذخیره فایل"
@@ -1308,51 +1213,146 @@ msgstr "حساب صادر شد!"
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "افزودن حساب..."
+
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "گشودن گپ"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "خروج از صفحهٔ تنظیمات"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "تماس ورودی"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "درخواست جدید از جانب"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "درخواست اعتماد"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "پیام جدید"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "جمی نرم‌افزار آزاد برای ارتباط جهانی است که به آزادی‌ها و محرمانگی کاربرانش احترام می‌گذارد."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "پاک‌سازی تاریخچه"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "مسدودسازی مخاطب"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "ارسال فایل"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "پایان"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "ارسال"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "خطای جمی"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "نمایش جمی"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "خروج"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1360,7 +1360,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "خودکار"
diff --git a/po/fi.po b/po/fi.po
index 418006eaf13f7ea7e2f17a1d2dde511d8f1c8491..0b5a29c9f414dae8fb3b8bb7663df236555bb7e0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/jami/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Lopeta"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Valikko"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Yleiset"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Tunnus"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Asetukset"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Keskustelu"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Yhteyspyynnöt"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Vaaditaan tunnuksen siirtoa"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Tallenne"
 
@@ -369,11 +386,6 @@ msgstr "Seuraava"
 msgid "Profile"
 msgstr "Profiili"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Tunnus"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Rekisteröi käyttäjänimi"
@@ -381,7 +393,7 @@ msgstr "Rekisteröi käyttäjänimi"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Lopeta"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Järjestelmä"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Valikko"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Yleiset"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Asetukset"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Keskustelu"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Yhteyspyynnöt"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -927,48 +927,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Lopeta"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Hyväksy"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Kieltäydy"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Kieltäydy"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Tallenna"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami on vapaa ja universaali viestintäalusta, joka kunnioittaa käyttäjiensä vapauksia ja yksityisyyttä."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Kieltäydy"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Kieltäydy"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -1072,7 +1068,7 @@ msgstr "Työskentelee…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Lisää tunnus…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Saapuva puhelu"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Uusi viesti"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Tyhjennä historia"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Estä yhteystieto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Virheenjäljitys päälle"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Virheenjäljitys päälle"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Salasanat eivät täsmää"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Tallenna tiedosto"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Lisää tunnus…"
+
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Saapuva puhelu"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Uusi viesti"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami on vapaa ja universaali viestintäalusta, joka kunnioittaa käyttäjiensä vapauksia ja yksityisyyttä."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Tyhjennä historia"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Estä yhteystieto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Lähetä"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Lopeta"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaattinen"
diff --git a/po/fr.po b/po/fr.po
index 5ba8c171caa0159bd0643ce06df74d846643feb2..e41d424c9109be2833ad2def9475efa82a6b9910 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (http://www.transifex.com/savoirfairelinux/jami/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,18 +37,6 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Raccourci clavier"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "À _propos"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Quitter"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -179,6 +167,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Écrire sur une nouvelle ligne"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Général"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Médias"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Compte"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Paramètres"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversations"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Invitations"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Migration de compte nécessaire"
@@ -267,7 +284,7 @@ msgid "Toggle recording"
 msgstr "Bouton d'enregistrement"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Enregistrer"
 
@@ -386,11 +403,6 @@ msgstr "Suivant"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Compte"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Enregistrer le nom d'utilisateur"
@@ -398,9 +410,9 @@ msgstr "Enregistrer le nom d'utilisateur"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Jami. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre identifiant de 40 caractères."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -461,6 +473,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Connexion"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Raccourci clavier"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "À _propos"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Quitter"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Système"
@@ -553,30 +577,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "Code QR"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Général"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Médias"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Paramètres"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversations"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Invitations"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Paramètres Audio"
@@ -944,48 +944,6 @@ msgstr "Annuler"
 msgid "Set selection as image"
 msgstr "Utiliser la sélection comme image de profil"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Impossible de démarrer\nVérifier que le serveur Jami  fonctionne\nErreur: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Erreur Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Afficher Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Ouvrir la conversation"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accepter"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Refuser"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Décliner"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Enregistrer un nom d'utilisateur sur le serveur de nom"
@@ -1047,16 +1005,54 @@ msgid "Choose download folder"
 msgstr "Choisissez le dossier de téléchargement"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Sauvegarder"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Ceci est votre nom d'utilisateur Jami. Conservez et partagez-le avec vos amis !"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Ouvrir la conversation"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Décliner"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Partager une partie de votre écran"
@@ -1077,7 +1073,7 @@ msgstr "Afficher les informations avancées"
 msgid "Open Avatar Image"
 msgstr "Ouvrir l’image de profil"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -1089,9 +1085,9 @@ msgstr "Traitement en cours …"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\ncompilé le %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1111,97 +1107,6 @@ msgstr "Arrêter l'enregistrement "
 msgid "Send recorded message"
 msgstr "Envoyer le message enregistré"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Ajouter un compte ..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Appeler"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Ouvrir la discussion"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - Migration nécessaire"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migration en cours ... S'il vous plaît, ne fermez pas la fenêtre."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Chercher ou démarrer une conversation"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Quitter la page des réglages"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Il y a des appels en cours"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "vous appelle"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Appel entrant"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nouvelle demande de "
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Invitation"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nouveau message"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Mettre fin à l'appel en cours?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "I y a un appel en cours. Désirez vous fermer la fenêtre et mettre fin à tous les appels en cours?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Effacer l'historique"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Voulez-vous vraiment effacer l'historique de cette conversation ?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Supprimer la conversation"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Êtes-vous certain de vouloir supprimer cette conversation ? "
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloquer le contact"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Souhaitez-vous vraiment bloquer ce contact ?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1217,6 +1122,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Impossible de se reconnecter au daemon Jami (dring).\nLe programme va maintenant se terminer."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Activer le débogage"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaurer l’état caché de la fenêtre principale (applicable seulement à la première instance)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- le client GNOME de Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Faire un appel vidéo"
@@ -1261,20 +1180,6 @@ msgstr "_Profile"
 msgid "(None)"
 msgstr "(None)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Activer le débogage"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "- le client GNOME de Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Une erreur s'est produite pendant la création de votre compte."
@@ -1286,7 +1191,7 @@ msgstr "Je n'arrive pas à retrouver votre compte. Vérifiez votre NIP ou bien l
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "Aucun compte récupéré. Vérifier votre fichier d'archive et/ou votre mot de passe."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1301,7 +1206,7 @@ msgstr "Les mots de passes ne correspondent pas"
 msgid "Import from backup"
 msgstr "Importer à partir d'une sauvegarde."
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Sauvegarder"
@@ -1322,51 +1227,146 @@ msgstr "Le compte a été exporté."
 msgid "Export account failure."
 msgstr "Échec de l'export de compte."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Ceci est votre nom d'utilisateur Jami. Conservez et partagez-le avec vos amis !"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Ajouter un compte ..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Ceci est votre identifiant Jami. Conservez et partagez-le avec vos amis !"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Appeler"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Ouvrir la discussion"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - Migration nécessaire"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migration en cours ... S'il vous plaît, ne fermez pas la fenêtre."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Chercher ou démarrer une conversation"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Quitter la page des réglages"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Il y a des appels en cours"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "vous appelle"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nouvelle demande de "
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Invitation"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nouveau message"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Mettre fin à l'appel en cours?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "I y a un appel en cours. Désirez vous fermer la fenêtre et mettre fin à tous les appels en cours?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Voulez-vous vraiment effacer l'historique de cette conversation ?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Supprimer la conversation"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Êtes-vous certain de vouloir supprimer cette conversation ? "
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloquer le contact"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Souhaitez-vous vraiment bloquer ce contact ?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Envoyez un fichier"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Réessaie"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Envoyer"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Impossible de démarrer\nVérifier que le serveur Jami  fonctionne\nErreur: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Erreur Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Afficher Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Quitter"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Conférence courantes (tous les comptes)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Appels courant (tous les comptes)"
 
@@ -1374,7 +1374,7 @@ msgstr "Appels courant (tous les comptes)"
 msgid "Online contacts"
 msgstr "Contacts en ligne"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/fr_BE.po b/po/fr_BE.po
index e5cda4a24450a940b23d05d3cebffb8a1151aa15..f0ea8a4da070a270864b2e60d9ed641eb6e401ec 100644
--- a/po/fr_BE.po
+++ b/po/fr_BE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/fr_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: fr_BE\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Général"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr ""
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr ""
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -366,11 +383,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr ""
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr "ok"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Général"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr ""
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/fr_CA.po b/po/fr_CA.po
index c2ba494736ee33f3eb74e70cc6f86b0110646a57..5495add22556331518d8b4c5c8cd65bd723114f0 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -22,18 +22,6 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_A propos"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Quitter"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -164,6 +152,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Général"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Média"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Compte"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Réglages"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversations"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Demandes de contact"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -252,7 +269,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Enregistrement"
 
@@ -371,11 +388,6 @@ msgstr "Suivant"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Compte"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -383,7 +395,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -446,6 +458,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_A propos"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Quitter"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Système"
@@ -538,30 +562,6 @@ msgstr "Identifiant"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Général"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Média"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Réglages"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversations"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Demandes de contact"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Paramètres audio"
@@ -929,48 +929,6 @@ msgstr "Retour"
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accepter"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Refuser"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Refuser"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1032,16 +990,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accepter"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Refuser"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1062,7 +1058,7 @@ msgstr "Afficher l'information avancée "
 msgid "Open Avatar Image"
 msgstr "Ouvrir l'image de l'avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -1074,7 +1070,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1096,97 +1092,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Appeler"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Ouvrir le clavardage"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Appel entrant"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Effacer l'historique"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1202,6 +1107,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Activer le déverminage"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1246,20 +1165,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Activer le déverminage"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1286,7 +1191,7 @@ msgstr "Les mots de passes en sont pas identiques"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Enregistrer le fichier"
@@ -1307,51 +1212,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Appeler"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Ouvrir le clavardage"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Appel entrant"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Effacer l'historique"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Envoyer"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1359,7 +1359,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/fr_CH.po b/po/fr_CH.po
index ac81db89b4eae39282cccbe7f2c0f7affade4a74..4b9790e91c549841f4b265c2fc775e0bc91d07fc 100644
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Switzerland) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Général"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr ""
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr ""
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -367,11 +384,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr ""
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr "ok"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Général"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr ""
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0da7a548bd638aa601d03c3008172efae3c8b84f..68f1f8a07565a56b8f39341ffa2ee316dde00964 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/jami/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Général"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "compte"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr ""
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversation"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -366,11 +383,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "compte"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Système"
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Général"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr ""
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversation"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Refuser"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Refuser"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Refuser"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Refuser"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Vider l'historique"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami est un logiciel libre de communication universel qui respecte la vie privée et l'intimité de ses utilisateurs."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Vider l'historique"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 92cdb0da5abba1fc90a1a48050c3492fae789cb7..5e930d05e0dfa6b89fabda537401620b9b8f2eee 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/jami/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,6 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_אודות"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "י_ציאה"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -161,6 +149,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "תפריט"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "כלליות"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "מדיה"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "חשבון"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "הגדרות"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "דיונים"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -249,7 +266,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "הקלט"
 
@@ -368,11 +385,6 @@ msgstr "קדימה"
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "חשבון"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -380,7 +392,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -443,6 +455,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_אודות"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "י_ציאה"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -535,30 +559,6 @@ msgstr "מזהה"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "תפריט"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "כלליות"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "מדיה"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "הגדרות"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "דיונים"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -926,48 +926,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "קבל"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1029,16 +987,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_ביטול"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "קבל"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1059,7 +1055,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_פתח"
 
@@ -1071,7 +1067,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1093,97 +1089,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "קריאה נכנסת"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1199,6 +1104,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Enable debug"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1243,20 +1162,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Enable debug"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1283,7 +1188,7 @@ msgstr "סיסמאות לא תואמות"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1304,51 +1209,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "קריאה נכנסת"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "עצור"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "שלח"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index c0f632684d505babcf72a0781978a3b7bc9db70e..e61b33c7f1ff07d9e2c6b79d4a79a033ed3e71ac 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/jami/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_O programu"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Prekini"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Izbornik"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Opće"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medij"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Račun"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Postavke"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Razgovori"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Snimaj"
 
@@ -367,11 +384,6 @@ msgstr "Slijedeće"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Račun"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr "U redu"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_O programu"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Prekini"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sustav"
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Izbornik"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Opće"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medij"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Postavke"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Razgovori"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Prihvati"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Odbij"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Odbij"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Prihvati"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Odbij"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Odbij"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Dolazni poziv"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Očisti povijest"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokiraj kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Spremi datoteku"
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Dolazni poziv"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Očisti povijest"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokiraj kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Prekini"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Pošalji"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 43f6e1692958e44e68184aaa8c053278f58e18c8..328c0204e17012e6d0492a38926bb3acea5c2398 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/jami/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "_Gyorsbillentyűk"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Névjegy"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Kilépés"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Új sorban írás"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menü"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Általános"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Média"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Fiók"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Beállítások"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Társalgások"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kapcsolat kérelmek"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Fiók áttelepítés szükséges"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr "Felvétel be-/kikapcsolása"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Felvétel"
 
@@ -369,11 +386,6 @@ msgstr "Következő"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Fiók"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Felhasználónév bejegyeztetése"
@@ -381,9 +393,9 @@ msgstr "Felhasználónév bejegyeztetése"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Ezt bejelölve, bejegyez egy egyedi felhasználónevet a Jami hálózaton. Az emberek ezt a Jami azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Bejelentkezés"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "_Gyorsbillentyűk"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Névjegy"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Kilépés"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Rendszer"
@@ -536,30 +560,6 @@ msgstr "Azonosító"
 msgid "QR Code"
 msgstr "QR-kód"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menü"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Általános"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Média"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Beállítások"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Társalgások"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kapcsolat kérelmek"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Hangbeállítások"
@@ -927,48 +927,6 @@ msgstr "Vissza"
 msgid "Set selection as image"
 msgstr "Kijelölés beállítása képként"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\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 Jami rendszerfolyamat (dring) fut.\nHiba: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami hiba"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Jami megjelenítése"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Kilépés"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Társalgás megnyitása"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Elfogadás"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Elutasítás"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Elutasítás"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Bejegyez ezt a felhasználónevet a névkiszolgálón"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr "Letöltési mappa kiválasztása"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Mégse"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Mentés"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Ez az Ön Jami azonosítója.\nMásolja ki, és ossza meg barátaival!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Ez az Ön azonosítója.\nMásolja és ossza meg a barátaival!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Társalgás megnyitása"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Elfogadás"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Elutasítás"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Elutasítás"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "_Képernyő részének megosztása"
@@ -1060,7 +1056,7 @@ msgstr "Haladó részletek megjelenítése"
 msgid "Open Avatar Image"
 msgstr "Megtestesülés kép megnyitása"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Megnyitás"
 
@@ -1072,9 +1068,9 @@ msgstr "Dolgozik…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "„Élj szabadon vagy halj meg”\nkódtár verziója: %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr "Felvétel leállítása"
 msgid "Send recorded message"
 msgstr "Felvett üzenet küldése"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Fiók hozzáadása…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Hívás kezdeményezése"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Csevegés megnyitása"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - áttelepítés szükséges"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Az áttelepítés folyamatban van… Kérjük, ne zárja be ezt az ablakot."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Társalgás keresése vagy indítása"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "A beállítási oldal elhagyása"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Folyamatban lévő hívás(ok)"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr " hív!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Bejövő hívás"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Új kérés"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Megbízható kérelem"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Új üzenet"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "A jelenlegi hívás(ok) leállítása?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "A hívás jelenleg folyamatban van. Be kívánja zárni az ablakot és az összes jelenlegi hívást?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Előzmények törlése"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Valóban szeretné törölni ennek a csevegésnek az előzményeit?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Társalgás törlése"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Valóban szeretné törölni ezt a csevegését?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Kapcsolat letiltása"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Valóban szeretné letiltani ezt a kapcsolatot?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Nem sikerült újrakapcsolódni a Jami rendszerfolyamathoz (dring).\nA Jami most kilép."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Engedélyezze a hibakeresést"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Visszaállítja a főablak rejtett állapotát (csak az elsődleges példányra vonatkozik)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "– GNOME ügyfél Jami számára"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "_Videohívás"
@@ -1244,20 +1163,6 @@ msgstr "_Profil"
 msgid "(None)"
 msgstr "(Nincs)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Engedélyezze a hibakeresést"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "– GNOME ügyfél Jami számára"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Hiba történt a fiók létrehozása során."
@@ -1269,7 +1174,7 @@ msgstr "Nem lehet lekérni egy fiókot, kérjük, ellenőrizze PIN-kódját és
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "Nem lehet lekérni bármilyen fiókot, kérjük, ellenőrizze archívumát és jelszavát."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1284,7 +1189,7 @@ msgstr "A jelszók nem egyeznek"
 msgid "Import from backup"
 msgstr "Importálás biztonsági másolatból"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Fájl mentése"
@@ -1305,51 +1210,146 @@ msgstr "A fiókot exportálták!"
 msgid "Export account failure."
 msgstr "Fiók exportálási hiba."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Ez az Ön Jami azonosítója.\nMásolja ki, és ossza meg barátaival!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Fiók hozzáadása…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Ez az Ön azonosítója.\nMásolja és ossza meg a barátaival!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Hívás kezdeményezése"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Csevegés megnyitása"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - áttelepítés szükséges"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Az áttelepítés folyamatban van… Kérjük, ne zárja be ezt az ablakot."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Társalgás keresése vagy indítása"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "A beállítási oldal elhagyása"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Folyamatban lévő hívás(ok)"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr " hív!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Bejövő hívás"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Új kérés"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Megbízható kérelem"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Új üzenet"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "A jelenlegi hívás(ok) leállítása?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "A hívás jelenleg folyamatban van. Be kívánja zárni az ablakot és az összes jelenlegi hívást?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Előzmények törlése"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Valóban szeretné törölni ennek a csevegésnek az előzményeit?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Társalgás törlése"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Valóban szeretné törölni ezt a csevegését?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Kapcsolat letiltása"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Valóban szeretné letiltani ezt a kapcsolatot?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Újra"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Megállítás"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Elküld"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\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 Jami rendszerfolyamat (dring) fut.\nHiba: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami hiba"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Jami megjelenítése"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Kilépés"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 bejegyzett neved is elveszhető!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Jelenlegi konferenciát (minden fiók)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Jelenlegi hívást (minden fiók)"
 
@@ -1357,7 +1357,7 @@ msgstr "Jelenlegi hívást (minden fiók)"
 msgid "Online contacts"
 msgstr "Elérhető kapcsolatok"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Önműködő"
diff --git a/po/id.po b/po/id.po
index 78728f217ffe0479a382aeeebc2822aef0137a31..68f58832ed6240b730ac43a80b09d3bda3c00b20 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/jami/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr ""
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Akun"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr ""
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Rekam"
 
@@ -366,11 +383,6 @@ msgstr "Selanjutnya"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Akun"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr ""
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr ""
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Terima"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Tolak"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Tolak"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Terima"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Tolak"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Tolak"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Kirim"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 1e2f97f3c98ca66d1b329e4c47442b47eac1cb02..38c0c4964a50d172ca7962aa72c3d21c6d06467e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/jami/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,6 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Tasti _Rapidi"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_A proposito"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Chiudi"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -163,6 +151,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Scrivi su una nuova riga"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generale"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Profilo"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Converzazioni"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Richieste di contatto"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "È richiesta la migrazione dell'account"
@@ -251,7 +268,7 @@ msgid "Toggle recording"
 msgstr "Attiva/disattiva la registrazione"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Registrare"
 
@@ -370,11 +387,6 @@ msgstr "Seguente"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Profilo"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registra il nome utente"
@@ -382,9 +394,9 @@ msgstr "Registra il nome utente"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Selezionando questo, registrerai un nome utente univoco sulla rete Jami. Le persone possono usarlo per contattarti invece di usare RingID, che è lungo 40 caratteri."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -445,6 +457,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Tasti _Rapidi"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_A proposito"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Chiudi"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -537,30 +561,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "Codice QR"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generale"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Converzazioni"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Richieste di contatto"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Impostazioni audio"
@@ -928,48 +928,6 @@ msgstr "Ritornare"
 msgid "Set selection as image"
 msgstr "Impostare la selezione come immagine"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Impossibile inizializzare.\nAssicurati che il demone Jami (dring) sia in esecuzione.\nErrore: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Errore Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostra Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Esci"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Apri conversazione"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accettare"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Rifiuta"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rifiuta"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registra questo nome utente sul nome server "
@@ -1031,16 +989,54 @@ msgid "Choose download folder"
 msgstr "Scegli la cartella di download"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Salva"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Questo è il tuo nome utente Jami.\nCopia e condividi con i tuoi amici!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Questo è il tuo ID.\nCopia e condividi con i tuoi amici!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Apri conversazione"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accettare"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifiuta"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rifiuta"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Condividi _area dello schermo"
@@ -1061,7 +1057,7 @@ msgstr "Mostra informazioni avanzate"
 msgid "Open Avatar Image"
 msgstr "Aprire l'immagine di avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Aprire"
 
@@ -1073,9 +1069,9 @@ msgstr "Sto lavorando..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Vivi libero o muori\"\ncostruito su %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1095,97 +1091,6 @@ msgstr "Interrompe la registrazione"
 msgid "Send recorded message"
 msgstr "Invia un messaggio registrato"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Aggiungi account…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Effettua chiamata"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "apri chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Esci dalla pagina delle impostazioni"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Ci sono chiamate attive"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "ti sta chiamando!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Chiamata in arrivo"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nuova richiesta da"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Richiesta fidata"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nuovo messaggio"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Interrompe la chiamata corrente?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Svuotare lo storico"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Rimuovi conversazione"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Vuoi davvero rimuovere questa conversazione?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blocca contatto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Vuoi davvero bloccare questo contatto?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1201,6 +1106,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Impossibile riconnettersi al demone Jami (dring).\nJami ora si chiudera'."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Attivare il debug"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Ristorare lo stato nascosto della finestra principale (applicabile solo all'instanza principale)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Client GNOME per Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Effettua _video chiamata"
@@ -1245,20 +1164,6 @@ msgstr "_Profilo"
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Attivare il debug"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Ristorare lo stato nascosto della finestra principale (applicabile solo all'instanza principale)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- Client GNOME per Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1285,7 +1190,7 @@ msgstr "Le password no corrispondono"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Salvare il file"
@@ -1306,51 +1211,146 @@ msgstr "Account esportato!"
 msgid "Export account failure."
 msgstr " Esportazione account non riuscito."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Questo è il tuo nome utente Jami.\nCopia e condividi con i tuoi amici!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Aggiungi account…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Questo è il tuo ID.\nCopia e condividi con i tuoi amici!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Effettua chiamata"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "apri chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Esci dalla pagina delle impostazioni"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Ci sono chiamate attive"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "ti sta chiamando!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Chiamata in arrivo"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nuova richiesta da"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Richiesta fidata"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nuovo messaggio"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Interrompe la chiamata corrente?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Svuotare lo storico"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Rimuovi conversazione"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Vuoi davvero rimuovere questa conversazione?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blocca contatto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Vuoi davvero bloccare questo contatto?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Inviare file"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Riprova"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Invia"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Impossibile inizializzare.\nAssicurati che il demone Jami (dring) sia in esecuzione.\nErrore: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Errore Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostra Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Esci"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Attenzione! Questa azione rimuoverà questo account su questo dispositivo!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1358,7 +1358,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr "Contatti online"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/it_IT.po b/po/it_IT.po
index 50d9049ec1342b415bf4d12f2ec3418ddac307e6..f3c45fac3122e34df7998fa26d6529ab5bb6513b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/jami/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Tasti _Rapidi"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Riguardo a"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Esci"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -165,6 +153,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Scrivi su una nuova riga"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generale"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Utente"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Opzioni"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversazioni"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Richiesta di contatto"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Migrazione account richiesta"
@@ -253,7 +270,7 @@ msgid "Toggle recording"
 msgstr "Registrazione"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Registra"
 
@@ -372,11 +389,6 @@ msgstr "Prossimo"
 msgid "Profile"
 msgstr "Profilo"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Utente"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registra il nome utente"
@@ -384,9 +396,9 @@ msgstr "Registra il nome utente"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Controllando questo, registrerai un nome utente univoco sulla rete Jami. Le persone possono usarlo per contattarti invece di usare RingID, che è lungo 40 caratteri."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -447,6 +459,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Registrati"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Tasti _Rapidi"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Riguardo a"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Esci"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -539,30 +563,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR Code"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generale"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Opzioni"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversazioni"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Richiesta di contatto"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Impostazioni Audio"
@@ -930,48 +930,6 @@ msgstr "Indietro"
 msgid "Set selection as image"
 msgstr "Imposta l'immagine selezionata"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Unable to initialize.\nAssicurati che il demone Jami (dring) sia in esecuzione.\nErrore: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Errore Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostra Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Esci"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Apri conversazione"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accetta"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Rifiuto"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rifiuta"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registra questo nome utente sul server dei nomi"
@@ -1033,16 +991,54 @@ msgid "Choose download folder"
 msgstr "Scegli la cartella di download"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annulla"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Salva"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Questo è il tuo nome utente Jami.\nCopia e condividi con i tuoi amici!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Questo è il tuo ID.\nCopia e condividi con i tuoi amici!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Apri conversazione"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accetta"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Rifiuto"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rifiuta"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Condividi _area dello schermo"
@@ -1063,7 +1059,7 @@ msgstr "Mostra informazioni avanzate"
 msgid "Open Avatar Image"
 msgstr "Apri immagine dell'Avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Apri"
 
@@ -1075,9 +1071,9 @@ msgstr "Sto lavorando…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Vivi libero o muori\"\ncostruito su %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1097,97 +1093,6 @@ msgstr "Interrompi la registrazione"
 msgid "Send recorded message"
 msgstr "Invia un messaggio registrato"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Aggiungi account…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "chiama"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "apri chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami: Migrazione necessaria"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migrazione in corso ... non chiudere questa finestra."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Cerca o avvia una conversazione"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Lascia la pagina delle impostazioni"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Ci sono chiamate attive"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "ti sta chiamando!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Chiamata in ingresso"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nuova richiesta da"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Richiesta fidata"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nuovo messaggio"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Interrompe la chiamata corrente?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Elimina cronologia"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Rimuovi conversazione"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Vuoi davvero rimuovere questa conversazione?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blocca contatto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Vuoi davvero bloccare questo contatto?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1203,6 +1108,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Impossibile riconnettersi al demone Jami (dring).\nJami ora verrà terminato."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Abilita debug"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Ripristina lo stato nascosto della finestra principale (applicabile solo all'istanza principale)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Client GNOME per Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Effettua _una videochiamata"
@@ -1247,20 +1166,6 @@ msgstr "_Profilo"
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Abilita debug"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Ripristina lo stato nascosto della finestra principale (applicabile solo all'istanza principale)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- Client GNOME per Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Si è verificato un errore durante la creazione dell'account."
@@ -1272,7 +1177,7 @@ msgstr "Impossibile recuperare alcun account, verifica il PIN e la password."
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "Impossibile recuperare alcun account, verifica l'archivio e la password."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1287,7 +1192,7 @@ msgstr "Le password non coincidono"
 msgid "Import from backup"
 msgstr "Importa da backup"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Salva File"
@@ -1308,51 +1213,146 @@ msgstr "Account esportato!"
 msgid "Export account failure."
 msgstr "Esportazione account fallito."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Questo è il tuo nome utente Jami.\nCopia e condividi con i tuoi amici!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Aggiungi account…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Questo è il tuo ID.\nCopia e condividi con i tuoi amici!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "chiama"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "apri chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami: Migrazione necessaria"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migrazione in corso ... non chiudere questa finestra."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Cerca o avvia una conversazione"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Lascia la pagina delle impostazioni"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Ci sono chiamate attive"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "ti sta chiamando!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Chiamata in ingresso"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nuova richiesta da"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Richiesta fidata"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nuovo messaggio"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Interrompe la chiamata corrente?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami è un software gratuito per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Elimina cronologia"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Rimuovi conversazione"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Vuoi davvero rimuovere questa conversazione?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blocca contatto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Vuoi davvero bloccare questo contatto?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Invia file"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Riprova"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Invia"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Unable to initialize.\nAssicurati che il demone Jami (dring) sia in esecuzione.\nErrore: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Errore Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostra Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Esci"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Attenzione! Questa azione rimuoverà questo account su questo dispositivo!\nNota: questa azione non può essere annullata. Inoltre, il tuo nome registrato può essere perso!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Conferenza corrente (tutti gli accounts)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Chiamate correnti (tutti gli accounts)"
 
@@ -1360,7 +1360,7 @@ msgstr "Chiamate correnti (tutti gli accounts)"
 msgid "Online contacts"
 msgstr "Contatti online"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/ja.po b/po/ja.po
index 58dbe711c4aa44e007b933bb3deb6185b14c747e..93a0e211a80b647173347b51a32a2f0920edcd28 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/jami/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,6 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "Ringについて(_A)"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "終了(_Q)"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -161,6 +149,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "メニュー"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "全般"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "メディア"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "アカウント"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "設定"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "会話"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "連絡先のリクエスト"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "アカウントの移行が必要です"
@@ -249,7 +266,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "記録"
 
@@ -368,11 +385,6 @@ msgstr "次へ"
 msgid "Profile"
 msgstr "プロフィール"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "アカウント"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -380,7 +392,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -443,6 +455,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "Ringについて(_A)"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "終了(_Q)"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "システム"
@@ -535,30 +559,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "メニュー"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "全般"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "メディア"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "設定"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "会話"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "連絡先のリクエスト"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -926,48 +926,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "受け入れ"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "拒否"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "辞退"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1029,16 +987,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "受け入れ"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "拒否"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "辞退"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1059,7 +1055,7 @@ msgstr "詳細情報を表示"
 msgid "Open Avatar Image"
 msgstr "アバター画像を開く"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -1071,7 +1067,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1093,97 +1089,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "通話を開始"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "チャットを開く"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "着信"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "履歴をクリア"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1199,6 +1104,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "デバッグを有効化"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "メインウィンドウの隠し状態を復元します (最初のインスタンスにのみ適用可能)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1243,20 +1162,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "デバッグを有効化"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "メインウィンドウの隠し状態を復元します (最初のインスタンスにのみ適用可能)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1283,7 +1188,7 @@ msgstr "パスワードが一致しません"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1304,51 +1209,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "通話を開始"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "チャットを開く"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "着信"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "履歴をクリア"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "停止"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "送信"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index f7540cb58f20b5151e0f2b76ae7556feac36d4f7..692037319d2e777de5bdebe14fbcc563730cd3d8 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/jami/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "일반"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "계정"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "설정"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "대화"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -366,11 +383,6 @@ msgstr "다음"
 msgid "Profile"
 msgstr "프로필"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "계정"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "일반"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "설정"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "대화"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "수락"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "수락"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "파일 저장"
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "자동"
diff --git a/po/lt.po b/po/lt.po
index 968d6fd9a27a62156064354ff149e26cb308a068..226c68f95993989b441e63d5265281b54ea75ff8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/jami/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Apie"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Išeiti"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Meniu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Bendra"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Medija"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Paskyra"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Pokalbiai"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Adresato užklausos"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Reikalingas paskyros perkėlimas"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Įrašyti"
 
@@ -369,11 +386,6 @@ msgstr "Kitas"
 msgid "Profile"
 msgstr "Profilis"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Paskyra"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registruoti naudotojo vardą"
@@ -381,9 +393,9 @@ msgstr "Registruoti naudotojo vardą"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Tai pažymėję, jūs Jami 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:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "Gerai"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Apie"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Išeiti"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR kodas"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Meniu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Bendra"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Medija"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Nustatymai"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Pokalbiai"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Adresato užklausos"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Garso nustatymai"
@@ -927,48 +927,6 @@ msgstr "Grįžti"
 msgid "Set selection as image"
 msgstr "Nustatyti pažymėtą sritį kaip paveikslą"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Nepavyko inicijuoti.\nĮsitikinkite, kad yra paleista Jami tarnyba (dring).\nKlaida: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami klaida"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Rodyti Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Išeiti"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Atverti pokalbį"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Priimti"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Atmesti"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Atmesti"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registruoti šį naudotojo vardą vardų serveryje"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "Į_rašyti"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Tai yra jūsų Jami naudotojo vardas.\nNukopijuokite ir dalinkitės juo su draugais!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Tai yra jūsų ID.\nNukopijuokite jį ir dalinkitės juo su savo draugais!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Atverti pokalbį"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Priimti"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Atmesti"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Atmesti"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Bendrinti _ekrano sritį"
@@ -1060,7 +1056,7 @@ msgstr "Rodyti išplėstinę informaciją"
 msgid "Open Avatar Image"
 msgstr "Atverti avataro paveikslą"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "A_tverti"
 
@@ -1072,9 +1068,9 @@ msgstr "Dirbama…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nsukurta ties %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Pridėti paskyrą…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "skambinti"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "atverti pokalbį"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Išeiti iš nustatymų puslapio"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr " jums skambina!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Gaunamasis skambutis"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nauja žinutė"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Išvalyti istoriją"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Šalinti pokalbį"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Užblokuoti adresatą"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Ar tikrai norite užblokuoti šį adresatą?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Nepavyko iš naujo prisijungti prie Jami tarnybos (dring).\nDabar, Jami baigs savo darbą."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Įjungti derinimą"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Atkuria pagrindinio lango paslėptą būseną (pritaikoma tik pirminiam egzemplioriui)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME kliento programa, skirta Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Pradėti _vaizdo skambutį"
@@ -1244,20 +1163,6 @@ msgstr "_Profilis"
 msgid "(None)"
 msgstr "(Nėra)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Įjungti derinimą"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Atkuria pagrindinio lango paslėptą būseną (pritaikoma tik pirminiam egzemplioriui)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- GNOME kliento programa, skirta Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Slaptažodžiai nesutampa"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Įrašyti failą"
@@ -1305,51 +1210,146 @@ msgstr "Paskyra eksportuota!"
 msgid "Export account failure."
 msgstr "Paskyros eksportavimas nepavyko."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Tai yra jūsų Jami naudotojo vardas.\nNukopijuokite ir dalinkitės juo su draugais!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Pridėti paskyrą…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Tai yra jūsų ID.\nNukopijuokite jį ir dalinkitės juo su savo draugais!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "skambinti"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "atverti pokalbį"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Išeiti iš nustatymų puslapio"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr " jums skambina!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Gaunamasis skambutis"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nauja žinutė"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami yra visuotiniam bendravimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Išvalyti istoriją"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Šalinti pokalbį"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Užblokuoti adresatą"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Ar tikrai norite užblokuoti šį adresatą?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Siųsti failą"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stabdyti"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Siųsti"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Nepavyko inicijuoti.\nĮsitikinkite, kad yra paleista Jami tarnyba (dring).\nKlaida: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami klaida"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Rodyti Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Išeiti"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Įspėjimas! Šis veiksmas pašalins šią paskyrą šiame įrenginyje!\nPastaba: šio veiksmo neįmanoma bus atšaukti. Be to, gali būti prarastas jūsų registruotas vardas!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatinė"
diff --git a/po/ms.po b/po/ms.po
index 32b7662c149489e3e35d9becaa5d1444860cb8fe..54531739d2a8b745ae34e130d5af51a4073af253 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/jami/language/ms/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Utama"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Akaun"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Aturan"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Rakam"
 
@@ -366,11 +383,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Akaun"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistem"
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Utama"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Aturan"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Terima"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Bantah panggilan"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Terima"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Bantah panggilan"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Panggilan masuk"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Padamkan sejarah"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Panggilan masuk"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Padamkan sejarah"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 6c2b9522621d3b7ce3b84f8dcb039062b11d9c4d..686a3e991f2f9417f1d7901a2d9cace7b16b437f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/jami/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,6 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Tastatur-_snarveier"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Om"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "Av_slutt"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -161,6 +149,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Skriv på en ny linje"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Meny"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generell"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Samtaler"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktforespørsler"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Krever kontooverføring"
@@ -249,7 +266,7 @@ msgid "Toggle recording"
 msgstr "Slå av/på opptak"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Ta opp"
 
@@ -368,11 +385,6 @@ msgstr "Neste"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrer brukernavn"
@@ -380,9 +392,9 @@ msgstr "Registrer brukernavn"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Ved å markere dette registrerer du et unikt brukernavn på Jami-nettverket.  Folk kan bruke det for å kontakte deg i stedet for å bruke din 40tegns RingID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -443,6 +455,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Tastatur-_snarveier"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Om"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "Av_slutt"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -535,30 +559,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Meny"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generell"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Samtaler"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktforespørsler"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Lydinnstilinger"
@@ -926,48 +926,6 @@ msgstr "Tilbake"
 msgid "Set selection as image"
 msgstr "Bruk utvalg som bilde"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Klargjøring feilet.\nPåse at Jami-bakgrunnsprosessen (dring) kjører.\nFeil: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami-feil"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Vis Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Avslutt"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Åpne samtale"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aksepter"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Avslå"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Avslå"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registrer dette brukernavnet på navnetjeneren"
@@ -1029,16 +987,54 @@ msgid "Choose download folder"
 msgstr "Velg nedlastingsmappe"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Lagre"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Dette er Jami-brukernavnet ditt.\nKopier og del det med dine venner!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Dette er ID-en din.\nKopier og del den med dine venner!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami er fri programvare for allsidig kommunikasjon som respekterer brukernes frihet og retten til privatliv."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Åpne samtale"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aksepter"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Avslå"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Avslå"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Del _skjermområde"
@@ -1059,7 +1055,7 @@ msgstr "Vis avansert informasjon"
 msgid "Open Avatar Image"
 msgstr "Åpne avatarbilde"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -1071,9 +1067,9 @@ msgstr "Jobber..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nbygd %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1093,97 +1089,6 @@ msgstr "Stopp opptak"
 msgid "Send recorded message"
 msgstr "Send innspilt melding"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Legg til konto"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "utfør samtale"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "åpne sludring"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Forlag oppsettside"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Det er pågående samtaler"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "ringer deg!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Innkommende samtale"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Ny henvendelse fra"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Stol på henvendelse"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Ny melding"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Stopp gjeldene samtale?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "En samtale er oppkoblet.  Ønsker du å lukke vinduet og avslutte alle samtaler?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Slett historikk"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Ønsker du virkelig å nullstille historikken for denne samtalen?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Fjern samtale"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Ønsker du virkelig å fjerne denne samtalen?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokker kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Ønsker du virkelig å blokkere denne kontakten?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1199,6 +1104,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Klarte ikke koble opp forbindelsen igjen til Jami-bakgrunnsprosessen (dring).\nJami avslutter nå."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Aktiver feilsøking"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Tilbakestiller den skjulte tilstanden til hovedvinduet (gjelder kun for primærinstansen)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME-klient for Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Utfør _videosamtale"
@@ -1243,20 +1162,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Aktiver feilsøking"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Tilbakestiller den skjulte tilstanden til hovedvinduet (gjelder kun for primærinstansen)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- GNOME-klient for Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1283,7 +1188,7 @@ msgstr "Passordene er ikke like"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Lagre fil"
@@ -1304,51 +1209,146 @@ msgstr "Konto eksportert!"
 msgid "Export account failure."
 msgstr "Feil ved eksport av konto."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Dette er Jami-brukernavnet ditt.\nKopier og del det med dine venner!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Legg til konto"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Dette er ID-en din.\nKopier og del den med dine venner!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "utfør samtale"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "åpne sludring"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Forlag oppsettside"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Det er pågående samtaler"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "ringer deg!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Innkommende samtale"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Ny henvendelse fra"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Stol på henvendelse"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Ny melding"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Stopp gjeldene samtale?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami er fri programvare for allsidig kommunikasjon som respekterer brukernes frihet og retten til privatliv."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "En samtale er oppkoblet.  Ønsker du å lukke vinduet og avslutte alle samtaler?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Slett historikk"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Ønsker du virkelig å nullstille historikken for denne samtalen?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Fjern samtale"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Ønsker du virkelig å fjerne denne samtalen?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokker kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Ønsker du virkelig å blokkere denne kontakten?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Forsøk igjen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Send"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Klargjøring feilet.\nPåse at Jami-bakgrunnsprosessen (dring) kjører.\nFeil: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami-feil"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Vis Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Avslutt"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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!  Denne handlingen vil fjerne denne kontoen fra denne enheten!\nMerk: Denne handlingen kan ikke gjøres om.  Merk videre at ditt registrerte navn kan gå tapt!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/nl.po b/po/nl.po
index 372b6fad1ab4cf84713f83e8b86e389320fdbe72..e06361cf6990052e65b8841d4513b8ec45a4fc0a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/jami/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "_Sneltoetsen"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Over"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "Af_sluiten"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Schrijf op een nieuwe regel"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Algemeen"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Account"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Gesprekken"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Contactverzoeken"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Accountmigratie vereist"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr "Opname in-/uitschakelen"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Opnemen"
 
@@ -369,11 +386,6 @@ msgstr "Volgende"
 msgid "Profile"
 msgstr "Profiel"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Account"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Gebruikersnaam registreren"
@@ -381,9 +393,9 @@ msgstr "Gebruikersnaam registreren"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Als u dit aanvinkt, zult u een unieke gebruikersnaam op het Jami-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om u te bellen, in plaats van uw 40 tekens lange Ring-ID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "Oké"
 msgid "Sign in"
 msgstr "Aanmelden"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "_Sneltoetsen"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Over"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "Af_sluiten"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Systeem"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR-code"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Algemeen"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Gesprekken"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Contactverzoeken"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Audio-instellingen"
@@ -927,48 +927,6 @@ msgstr "Terug"
 msgid "Set selection as image"
 msgstr "Selectie instellen als afbeelding"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Kan niet initialiseren.\nZorg dat de Jami-daemon (dring) wordt uitgevoerd.\nFout: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami-fout"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Jami weergeven"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Gesprek openen"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Accepteren"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Afwijzen"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Weigeren"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registreer deze gebruikersnaam op de naamserver"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "Op_slaan"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Dit is uw Jami-gebruikersnaam.\nDeel deze met uw vrienden!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Dit is uw ID. \n Kopieer en deel het met uw vrienden!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Gesprek openen"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Accepteren"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Afwijzen"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Weigeren"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "_Schermruimte delen"
@@ -1060,7 +1056,7 @@ msgstr "Toon geavanceerde informatie"
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Openen"
 
@@ -1072,9 +1068,9 @@ msgstr "Bezig…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "‘Live Free or Die’\ngecompileerd op %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr "Opname beëindigen"
 msgid "Send recorded message"
 msgstr "Opgenomen bericht versturen"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Account toevoegen…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "oproep plaatsen"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "gesprek openen"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - migratie vereist"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Instellingspagina verlaten"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Er zijn actieve oproepen"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "belt u!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Inkomende oproep"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nieuw verzoek van"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Vertrouwensverzoek"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nieuw bericht"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Huidige oproep beëindigen?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Geschiedenis wissen"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Gesprek verwijderen"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Wilt u dit gesprek echt verwijderen?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Contact blokkeren"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Wilt u dit contact echt blokkeren?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Kon niet opnieuw verbinding maken met de Jami-daemon (dring).\nJami zal nu afsluiten."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Foutopsporing inschakelen"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing op het primaire proces)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr " - GNOME-cliënt voor Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Video-oproep plaatsen"
@@ -1244,20 +1163,6 @@ msgstr "_Profiel"
 msgid "(None)"
 msgstr "(geen)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Foutopsporing inschakelen"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr " - GNOME-cliënt voor Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Een fout trad op bij het aanmaken van het account."
@@ -1284,7 +1189,7 @@ msgstr "Wachtwoorden komen niet overeen"
 msgid "Import from backup"
 msgstr "Importeren uit back-up"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Bestand opslaan"
@@ -1305,51 +1210,146 @@ msgstr "Account geëxporteerd!"
 msgid "Export account failure."
 msgstr "Fout bij exporteren van account."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Dit is uw Jami-gebruikersnaam.\nDeel deze met uw vrienden!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Account toevoegen…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Dit is uw ID. \n Kopieer en deel het met uw vrienden!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "oproep plaatsen"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "gesprek openen"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - migratie vereist"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Instellingspagina verlaten"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Er zijn actieve oproepen"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "belt u!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nieuw verzoek van"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Vertrouwensverzoek"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nieuw bericht"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Huidige oproep beëindigen?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Geschiedenis wissen"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Gesprek verwijderen"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Wilt u dit gesprek echt verwijderen?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Contact blokkeren"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Wilt u dit contact echt blokkeren?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Bestand versturen"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Versturen"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Kan niet initialiseren.\nZorg dat de Jami-daemon (dring) wordt uitgevoerd.\nFout: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami-fout"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Jami weergeven"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Afsluiten"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Let op! Deze handeling zal dit account van dit apparaat verwijderen!\nDeze handeling kan niet ongedaan gemaakt worden. Uw geregistreerde naam zal ook verloren gaan!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index f47d32b266bc75f11aae6d205e42e6666b5fe7e0..ca443b34253f0265b61488d2f1c45417bc9960fe 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "_Sneltoetsen"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Over"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "Af_sluiten"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Schrijf op een nieuwe lijn"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Algemeen"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Account"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Gesprekken"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Contactverzoeken"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Accountmigratie vereist"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr "Opname in-/uitschakelen"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Opnemen"
 
@@ -369,11 +386,6 @@ msgstr "Volgende"
 msgid "Profile"
 msgstr "Profiel"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Account"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Gebruikersnaam registreren"
@@ -381,9 +393,9 @@ msgstr "Gebruikersnaam registreren"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Als u dit aanvinkt, zult u een unieke gebruikersnaam op het Jami-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om u te bellen, in plaats van uw 40 tekens lange Ring-ID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "Oké"
 msgid "Sign in"
 msgstr "Aanmelden"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "_Sneltoetsen"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Over"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "Af_sluiten"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Systeem"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR-code"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Algemeen"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Gesprekken"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Contactverzoeken"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Audio-instellingen"
@@ -927,48 +927,6 @@ msgstr "Terug"
 msgid "Set selection as image"
 msgstr "Selectie instellen als afbeelding"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Kan niet initialiseren.\nZorg dat de Jami-daemon (dring) wordt uitgevoerd.\nFout: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami-fout"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Jami weergeven"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Gesprek openen"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aanvaarden"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Afwijzen"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Weigeren"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registreer deze gebruikersnaam op de naamserver"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "Op_slaan"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Dit is uw Jami-gebruikersnaam.\nDeel hem met uw vrienden!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Dit is uw ID. \n Kopieer en deel hem met uw vrienden!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en privacy van zijn gebruikers eerbiedigt."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Gesprek openen"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aanvaarden"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Afwijzen"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Weigeren"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "_Schermruimte delen"
@@ -1060,7 +1056,7 @@ msgstr "Toon geavanceerde informatie"
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Openen"
 
@@ -1072,9 +1068,9 @@ msgstr "Bezig…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "‘Live Free or Die’\ngecompileerd op %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr "Opname beëindigen"
 msgid "Send recorded message"
 msgstr "Opgenomen bericht versturen"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Account toevoegen…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "oproep plaatsen"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "gesprek openen"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - migratie vereist"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Instellingsblad verlaten"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Er zijn actieve oproepen"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "belt u!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Inkomende oproep"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nieuw verzoek van"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Vertrouwensverzoek"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nieuw bericht"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Huidige oproep beëindigen?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Geschiedenis wissen"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Gesprek verwijderen"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Wilt u dit gesprek echt verwijderen?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Contact blokkeren"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Wilt u dit contact echt blokkeren?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Kon niet herverbinden met de Jami-daemon (dring).\nJami zal nu afsluiten."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Foutopsporing inschakelen"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing op het primaire proces)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr " - GNOME-cliënt voor Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Video-oproep plaatsen"
@@ -1244,20 +1163,6 @@ msgstr "_Profiel"
 msgid "(None)"
 msgstr "(geen)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Foutopsporing inschakelen"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr " - GNOME-cliënt voor Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Er is een fout opgetreden bij het aanmaken van de account."
@@ -1284,7 +1189,7 @@ msgstr "Paswoorden komen niet overeen"
 msgid "Import from backup"
 msgstr "Importeren uit back-up"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Bestand opslaan"
@@ -1305,51 +1210,146 @@ msgstr "Account geëxporteerd!"
 msgid "Export account failure."
 msgstr "Fout bij exporteren van account."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Dit is uw Jami-gebruikersnaam.\nDeel hem met uw vrienden!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Account toevoegen…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Dit is uw ID. \n Kopieer en deel hem met uw vrienden!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "oproep plaatsen"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "gesprek openen"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - migratie vereist"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Instellingsblad verlaten"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Er zijn actieve oproepen"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "belt u!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Inkomende oproep"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nieuw verzoek van"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Vertrouwensverzoek"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nieuw bericht"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Huidige oproep beëindigen?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami is vrije software voor universele communicatie, die de vrijheden en privacy van zijn gebruikers eerbiedigt."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Geschiedenis wissen"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Gesprek verwijderen"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Wilt u dit gesprek echt verwijderen?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Contact blokkeren"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Wilt u dit contact echt blokkeren?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Bestand versturen"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Herproberen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Versturen"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Kan niet initialiseren.\nZorg dat de Jami-daemon (dring) wordt uitgevoerd.\nFout: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami-fout"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Jami weergeven"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Afsluiten"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Let op! Deze handeling zal deze account van dit apparaat verwijderen!\nDeze handeling kan niet ongedaan gemaakt worden. Uw geregistreerde naam zal ook verloren gaan!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 14bf45a78af2015d3f41c5572704bcac5445e2c2..b682295eadfe9fee1104b8c509c98a011a8e472a 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/jami/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Algemeen"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr ""
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -367,11 +384,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr ""
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Algemeen"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 40ba45ae51b2fb57ef7493947bb7d18b18f8cf8d..ac85c50ad36d6945f1205e7e145505725a25576d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/savoirfairelinux/jami/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "ਮੀਡੀਆ"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "ਖਾਤਾ"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "ਸੈਟਿੰਗ"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "ਗੱਲਾਂਬਾਤਾਂ"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "ਸੰਪਰਕ ਬੇਨਤੀਆਂ"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -367,11 +384,6 @@ msgstr "ਅੱਗੇ"
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "ਖਾਤਾ"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "ਸਿਸਟਮ"
@@ -534,30 +558,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "ਸਧਾਰਨ"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "ਮੀਡੀਆ"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "ਸੈਟਿੰਗ"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "ਗੱਲਾਂਬਾਤਾਂ"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "ਸੰਪਰਕ ਬੇਨਤੀਆਂ"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -925,48 +925,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "ਸਵੀਕਾਰ ਕਰੋ"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "ਅਸਵੀਕਾਰ ਕਰੋ"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "ਕਾਲ ਕੱਟੋ"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami ਦੁਨੀਆ ਭਰ ਵਿੱਚ ਸੰਚਾਰ ਕਰਨ ਲਈ ਮੁਫ਼ਤ ਸਾਫ਼ਟਵੇਅਰ ਹੈ ਜੋ ਆਪਣੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਅਜ਼ਾਦੀ ਅਤੇ ਪਰਦੇਦਾਰੀ ਦਾ ਖਿਆਲ ਰੱਖਦਾ ਹੈ।"
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "ਸਵੀਕਾਰ ਕਰੋ"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "ਅਸਵੀਕਾਰ ਕਰੋ"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "ਕਾਲ ਕੱਟੋ"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "ਆਉਂਦੀ ਕਾਲ"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "ਇਤਿਹਾਸ ਮਿਟਾਓ"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "ਆਉਂਦੀ ਕਾਲ"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami ਦੁਨੀਆ ਭਰ ਵਿੱਚ ਸੰਚਾਰ ਕਰਨ ਲਈ ਮੁਫ਼ਤ ਸਾਫ਼ਟਵੇਅਰ ਹੈ ਜੋ ਆਪਣੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਅਜ਼ਾਦੀ ਅਤੇ ਪਰਦੇਦਾਰੀ ਦਾ ਖਿਆਲ ਰੱਖਦਾ ਹੈ।"
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "ਇਤਿਹਾਸ ਮਿਟਾਓ"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "ਭੇਜੋ"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 73fd93733fb786fac99c890d7352048f5fde6459..fce331f38c2ccb9bc09cd4a20b3979d126f2d2aa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/jami/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "_Skróty Klawiszowe"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_O"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Wyjdź"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Pisz w nowej linii"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generalne"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Multimedia"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Rozmowy"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Zaproszenia"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Wymagana migracja konta"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr "Włącz/wyłącz nagrywanie"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Nagraj"
 
@@ -369,11 +386,6 @@ msgstr "Następne"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Zarejestruj nazwę użytkownika"
@@ -381,9 +393,9 @@ msgstr "Zarejestruj nazwę użytkownika"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Jami. Użytkownicy mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego ID które ma 40 znaków."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "_Skróty Klawiszowe"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_O"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Wyjdź"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generalne"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Multimedia"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Rozmowy"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Zaproszenia"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Ustawienia dźwięku"
@@ -927,48 +927,6 @@ msgstr "Powrót"
 msgid "Set selection as image"
 msgstr "Ustaw zaznaczenie jako obrazek"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Nie udało się zainicjalizować.\nUpewnij się, że daemon Jami (dring) jest uruchomiony.\nBłąd: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Błąd Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Pokaż Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Zamknij"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Otwórz rozmowę"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Odmów"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Odrzuć"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Zarejestruj nazwę użytkownika w serwerze nazw"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Zapisz"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "To jest twoja nazwa użytkownika Jami.\nSkopiuj i podziel się nią z przyjaciółmi!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "To jest twoje ID.\nSkopiuj i podziel się ze swoimi znajomymi!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Otwórz rozmowę"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmów"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Odrzuć"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Udostępnij _obszar ekranu"
@@ -1060,7 +1056,7 @@ msgstr "Pokaż zaawansowane informacje"
 msgid "Open Avatar Image"
 msgstr "Otwórz obraz awatara"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -1072,9 +1068,9 @@ msgstr "Pracuję..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nzbudowano %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr "Wyłącz nagrywanie"
 msgid "Send recorded message"
 msgstr "Wyślij nagraną wiadomość"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Dodaj konto..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Zadzwoń"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Otwórz chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Opuść stronę ustawień"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Są aktywne rozmowy"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "dzwoni do Ciebie!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Połączenie przychodzące"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nowe zaproszenie od"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Rządanie zaufania"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nowa wiadomość"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Zatrzymać aktualną rozmowę?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Rozmowa jest w trakcie. Czy chcesz zamknąć okno i wyłączyć wszystkie bieżące rozmowy?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Wyczyść historię"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Czy na pewno chcesz wyczyścić historię tej rozmowy?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Usuń rozmowę"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Czy na pewno chcesz usunąć tą rozmowę?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokuj kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Czy na pewno chcesz zablokować ten kontakt?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Nie udało się ponownie połączyć z daemonem Jami (dring).\nJami się teraz wyłączy."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Włącz debug"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji aplikacji)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Klient GNOME dla Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Rozmowa _wideo"
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr "(Brak)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Włącz debug"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji aplikacji)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- Klient GNOME dla Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "Hasła nie pasują"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Zapisz plik"
@@ -1305,51 +1210,146 @@ msgstr "Konto wyeksportowane!"
 msgid "Export account failure."
 msgstr "Błąd podczas eksportowania"
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "To jest twoja nazwa użytkownika Jami.\nSkopiuj i podziel się nią z przyjaciółmi!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Dodaj konto..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "To jest twoje ID.\nSkopiuj i podziel się ze swoimi znajomymi!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Zadzwoń"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Otwórz chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Opuść stronę ustawień"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Są aktywne rozmowy"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "dzwoni do Ciebie!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Połączenie przychodzące"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nowe zaproszenie od"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Rządanie zaufania"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nowa wiadomość"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Zatrzymać aktualną rozmowę?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Rozmowa jest w trakcie. Czy chcesz zamknąć okno i wyłączyć wszystkie bieżące rozmowy?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Wyczyść historię"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Czy na pewno chcesz wyczyścić historię tej rozmowy?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Usuń rozmowę"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Czy na pewno chcesz usunąć tą rozmowę?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokuj kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Czy na pewno chcesz zablokować ten kontakt?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Wyślij plik"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Ponów"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Wyślij"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Nie udało się zainicjalizować.\nUpewnij się, że daemon Jami (dring) jest uruchomiony.\nBłąd: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Błąd Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Pokaż Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Zamknij"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatycznie"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d8b46ca4d6dc1c4a56978297fab5e2dc326f1cd0..6ec2e07024d678306d8dd6dedd48450e2eadc15a 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/savoirfairelinux/jami/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_O"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Wyjdź"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Generalne"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Multimedia"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Rozmowy"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Zaproszenia"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Wymagana migracja konta"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr "Włącz/wyłącz nagrywanie"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Nagraj"
 
@@ -367,11 +384,6 @@ msgstr "Następne"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Zarejestruj nazwę użytkownika"
@@ -379,9 +391,9 @@ msgstr "Zarejestruj nazwę użytkownika"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Jami. Użytkownicy mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego ID które ma 40 znaków."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -442,6 +454,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_O"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Wyjdź"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -534,30 +558,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Generalne"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Multimedia"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Rozmowy"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Zaproszenia"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Ustawienia dźwięku"
@@ -925,48 +925,6 @@ msgstr "Powrót"
 msgid "Set selection as image"
 msgstr "Ustaw zaznaczenie jako obrazek"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Nie udało się zainicjalizować.\nUpewnij się, że daemon Jami (dring) jest uruchomiony.\nBłąd: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Błąd Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Pokaż Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Zamknij"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Otwórz rozmowę"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Odmów"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Odrzuć"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Zarejestruj nazwę użytkownika w serwerze nazw"
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Zapisz"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "To jest twoja nazwa użytkownika Jami.\nSkopiuj i podziel się nią z przyjaciółmi!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "To jest twoje ID.\nSkopiuj i podziel się ze swoimi znajomymi!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Otwórz rozmowę"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmów"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Odrzuć"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Udostępnij _obszar ekranu"
@@ -1058,7 +1054,7 @@ msgstr "Pokaż zaawansowane informacje"
 msgid "Open Avatar Image"
 msgstr "Otwórz obraz awatara"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -1070,9 +1066,9 @@ msgstr "Pracuję..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nzbudowano %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1092,97 +1088,6 @@ msgstr "Wyłącz nagrywanie"
 msgid "Send recorded message"
 msgstr "Wyślij nagraną wiadomość"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Dodaj konto..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Zadzwoń"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Otwórz chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Opuść stronę ustawień"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "dzwoni do Ciebie!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Połączenie przychodzące"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nowe zaproszenie od"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Rządanie zaufania"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nowa wiadomość"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Wyczyść historię"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blokuj kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Nie udało się ponownie połączyć z daemonem Jami (dring).\nJami się teraz wyłączy."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Włącz debug"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji aplikacji)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Klient GNOME dla Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Rozmowa _wideo"
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Włącz debug"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji aplikacji)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- Klient GNOME dla Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr "Hasła nie pasują"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Zapisz plik"
@@ -1303,51 +1208,146 @@ msgstr "Konto wyeksportowane!"
 msgid "Export account failure."
 msgstr "Błąd podczas eksportowania"
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "To jest twoja nazwa użytkownika Jami.\nSkopiuj i podziel się nią z przyjaciółmi!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Dodaj konto..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "To jest twoje ID.\nSkopiuj i podziel się ze swoimi znajomymi!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Zadzwoń"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Otwórz chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Opuść stronę ustawień"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "dzwoni do Ciebie!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Połączenie przychodzące"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nowe zaproszenie od"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Rządanie zaufania"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nowa wiadomość"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Wyczyść historię"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blokuj kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Wyślij plik"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Wyślij"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Nie udało się zainicjalizować.\nUpewnij się, że daemon Jami (dring) jest uruchomiony.\nBłąd: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Błąd Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Pokaż Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Zamknij"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatycznie"
diff --git a/po/pt.po b/po/pt.po
index bef302c5108647ab326bb9a2038c18e06250e0b8..a85e56ea2e8797f872499c85a04d9d93b3985113 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/jami/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Atalho_s de teclado"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Sobre"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Sair"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Escrever numa nova linha"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Geral"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Média"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Conta"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Configurações"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversas"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitações de contactos"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Necessário migrar a conta"
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr "Alternar gravação"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Gravar"
 
@@ -369,11 +386,6 @@ msgstr "Próximo"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Conta"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registar nome de utilizador"
@@ -381,9 +393,9 @@ msgstr "Registar nome de utilizador"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Ao ativar esta opção, irá registar um nome de utilizador único na rede Jami. 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:625
 msgid ""
@@ -444,6 +456,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Atalho_s de teclado"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Sobre"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Sair"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -536,30 +560,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "Código QR"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Geral"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Média"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Configurações"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversas"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitações de contactos"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Configuração de Áudio"
@@ -927,48 +927,6 @@ msgstr "Voltar"
 msgid "Set selection as image"
 msgstr "Definir seleção como imagem"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Não foi possível iniciar.\nCertifique-se que o processo Jami (dring) está a ser executado.\nErro: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Erro Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostrar Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Sair"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Abrir conversação"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aceitar"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Recusar"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rejeitar"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registar este nome de utilizador no servidor de nome"
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Gravar"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Este é o seu nome de utilizador no Jami.\nCopie e o partilhe-o com os seus amigos!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Este é o seu ID.\nCopie e partilhe com os seus amigos!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Abrir conversação"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aceitar"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Recusar"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rejeitar"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Partilhar _área do ecrã"
@@ -1060,7 +1056,7 @@ msgstr "Mostrar informação avançada"
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1072,9 +1068,9 @@ msgstr "A trabalhar…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1094,97 +1090,6 @@ msgstr "Parar de gravar"
 msgid "Send recorded message"
 msgstr "Enviar mensagem gravada"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Adicionar conta…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "fazer chamada"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "abrir conversa"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Deixar página de configurações"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Existem chamadas ativas"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "está a telefonar-lhe!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Chamada recebida"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Novo pedido de"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Confiar no pedido"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nova mensagem"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Parar a chamada atual?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Limpar histórico"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Quer mesmo eliminar o histórico desta conversação?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Remover conversação"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Quer mesmo remover esta conversação?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloquear contacto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Quer mesmo bloquear este contacto?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Não foi possível reconectar ao processo Jami (drink) .%s\nO Jami vai agora desligar-se."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Ativar depuração de erros"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaura o estado oculto da janela principal (aplicável apenas à primeira instância)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- cliente GNOME para o Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Fazer _chamada de vídeo"
@@ -1244,20 +1163,6 @@ msgstr "_Perfil"
 msgid "(None)"
 msgstr "(nenhum)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Ativar depuração de erros"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Restaura o estado oculto da janela principal (aplicável apenas à primeira instância)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- cliente GNOME para o Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr "As palavras-chave não são iguais"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Gravar Ficheiro"
@@ -1305,51 +1210,146 @@ msgstr "A conta foi exportada!"
 msgid "Export account failure."
 msgstr "Falha ao exportar a conta."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Este é o seu nome de utilizador no Jami.\nCopie e o partilhe-o com os seus amigos!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Adicionar conta…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Este é o seu ID.\nCopie e partilhe com os seus amigos!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "fazer chamada"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "abrir conversa"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Deixar página de configurações"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Existem chamadas ativas"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "está a telefonar-lhe!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Chamada recebida"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Novo pedido de"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Confiar no pedido"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nova mensagem"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Parar a chamada atual?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Limpar histórico"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Quer mesmo eliminar o histórico desta conversação?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Remover conversação"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Quer mesmo remover esta conversação?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloquear contacto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Quer mesmo bloquear este contacto?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Parar"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Enviar"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Não foi possível iniciar.\nCertifique-se que o processo Jami (dring) está a ser executado.\nErro: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Erro Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostrar Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Sair"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 233d06ce5708468e6ac16c23928bf9d2c6032b4b..ef11a1dbaf7ee5fa0b0fa03553ef4cf3a7ffcc66 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/jami/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -34,18 +34,6 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Sobre"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Sair"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -176,6 +164,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Geral"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Mídia"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Conta"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Configurações"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversas"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitações de contatos"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Migração de conta necessária"
@@ -264,7 +281,7 @@ msgid "Toggle recording"
 msgstr "Alternar gravação"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Gravar"
 
@@ -383,11 +400,6 @@ msgstr "Próximo"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Conta"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrar nome de usuário"
@@ -395,9 +407,9 @@ msgstr "Registrar nome de usuário"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Ao confirmar esta opção, você irá registrar um nome de usuário único na rede Jami. Pessoas poderão usá-lo para lhe contactar ao invés de usar o seu ID, que possui uma sequência de 40 caracteres."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -458,6 +470,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Sobre"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Sair"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -550,30 +574,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Geral"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Mídia"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Configurações"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversas"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitações de contatos"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Configuração de Áudio"
@@ -941,48 +941,6 @@ msgstr "Retornar"
 msgid "Set selection as image"
 msgstr "Configurar seleção como imagem"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Não foi possível inicializar.\nCertifique-se que o processo Jami (dring) está sendo executado.\nErro: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Erro Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostrar Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Sair"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Conversa em curso"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aceitar"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Recusar"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rejeitar"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registrar esse nome de usuário no servidor de nomes"
@@ -1044,16 +1002,54 @@ msgid "Choose download folder"
 msgstr "Escolha a pasta de arquivos baixados"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Salvar"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Este é o seu nome de usuário no Jami.\nCopie-o e compartilhe com seus amigos!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Esse é seu ID\nCopiei e compartilhe com seus amigos!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Conversa em curso"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aceitar"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Recusar"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rejeitar"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Compartilhar _área da tela"
@@ -1074,7 +1070,7 @@ msgstr "Mostrar informação avançada"
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1086,9 +1082,9 @@ msgstr "Trabalhando…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1108,97 +1104,6 @@ msgstr "Pare de gravar"
 msgid "Send recorded message"
 msgstr "Enviar mensagem gravada"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Adicionar conta…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "fazer ligação"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "abrir chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Deixar a página de configurações"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "está chamando você!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Chamada recebida"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nova requisição de"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Confiar na requisição"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nova mensagem"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Limpar histórico"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloquear contato"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1214,6 +1119,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Não foi possível reconectar ao processo do Jami (drink) .%s\nO Jami vai sair."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Ativar depuração"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaurar o estado oculto da janela principal (aplicável apenas à primeira instância)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- cliente GNOME para o Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Fazer _chamada de vídeo"
@@ -1258,20 +1177,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Ativar depuração"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Restaurar o estado oculto da janela principal (aplicável apenas à primeira instância)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- cliente GNOME para o Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1298,7 +1203,7 @@ msgstr "Senhas não condizentes"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Salvar arquivo"
@@ -1319,51 +1224,146 @@ msgstr "Conta exportada!"
 msgid "Export account failure."
 msgstr "Falha ao exportar a conta."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Este é o seu nome de usuário no Jami.\nCopie-o e compartilhe com seus amigos!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Adicionar conta…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Esse é seu ID\nCopiei e compartilhe com seus amigos!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "fazer ligação"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "abrir chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Deixar a página de configurações"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "está chamando você!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Chamada recebida"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nova requisição de"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Confiar na requisição"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nova mensagem"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Limpar histórico"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloquear contato"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Tente novamente"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Parar"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Enviar"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Não foi possível inicializar.\nCertifique-se que o processo Jami (dring) está sendo executado.\nErro: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Erro Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostrar Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Sair"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1371,7 +1371,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1cff1df8005696ef00f76dfc5d388641d7252279..fc7ea489e20ca0265bd539777c3ca360a14ce4c1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/jami/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Atalho_s de teclado"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Sobre"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Sair"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Escrever numa nova linha"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Geral"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Média"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Conta"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Configurações"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Conversas"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitações de contactos"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Necessário migrar a conta"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr "Alternar gravação"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Gravar"
 
@@ -367,11 +384,6 @@ msgstr "Próximo"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Conta"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registar nome de utilizador"
@@ -379,9 +391,9 @@ msgstr "Registar nome de utilizador"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Ao ativar esta opção, irá registar um nome de utilizador único na rede Jami. 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:625
 msgid ""
@@ -442,6 +454,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Atalho_s de teclado"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Sobre"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Sair"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistema"
@@ -534,30 +558,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "Código QR"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Geral"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Média"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Configurações"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Conversas"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitações de contactos"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Configuração de Áudio"
@@ -925,48 +925,6 @@ msgstr "Voltar"
 msgid "Set selection as image"
 msgstr "Definir seleção como imagem"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Não foi possível iniciar.\nCertifique-se que o processo Jami (dring) está a ser executado.\nErro: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Erro Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Mostrar Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Sair"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Abrir conversação"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Aceitar"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Recusar"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Rejeitar"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registar este nome de utilizador no servidor de nome"
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Gravar"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Este é o seu nome de utilizador no Jami.\nCopie e o partilhe-o com os seus amigos!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Este é o seu ID.\nCopie e partilhe com os seus amigos!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Abrir conversação"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Aceitar"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Recusar"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Rejeitar"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Partilhar _área do ecrã"
@@ -1058,7 +1054,7 @@ msgstr "Mostrar informação avançada"
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1070,9 +1066,9 @@ msgstr "A trabalhar…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1092,97 +1088,6 @@ msgstr "Parar de gravar"
 msgid "Send recorded message"
 msgstr "Enviar mensagem gravada"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Adicionar conta…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "fazer chamada"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "abrir conversa"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Deixar página de configurações"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Existem chamadas ativas"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "está a telefonar-lhe!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Chamada recebida"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Novo pedido de"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Confiar no pedido"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nova mensagem"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Parar a chamada atual?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Limpar histórico"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Quer mesmo eliminar o histórico desta conversação?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Remover conversação"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Quer mesmo remover esta conversação?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bloquear contacto"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Quer mesmo bloquear este contacto?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Não foi possível reconectar ao processo Jami (drink) .%s\nO Jami vai agora desligar-se."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Ativar depuração de erros"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Restaura o estado oculto da janela principal (aplicável apenas à primeira instância)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- cliente GNOME para o Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Fazer _chamada de vídeo"
@@ -1242,20 +1161,6 @@ msgstr "_Perfil"
 msgid "(None)"
 msgstr "(nenhum)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Ativar depuração de erros"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Restaura o estado oculto da janela principal (aplicável apenas à primeira instância)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- cliente GNOME para o Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr "As palavras-chave não são iguais"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Gravar Ficheiro"
@@ -1303,51 +1208,146 @@ msgstr "A conta foi exportada!"
 msgid "Export account failure."
 msgstr "Falha ao exportar a conta."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Este é o seu nome de utilizador no Jami.\nCopie e o partilhe-o com os seus amigos!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Adicionar conta…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Este é o seu ID.\nCopie e partilhe com os seus amigos!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "fazer chamada"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "abrir conversa"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Deixar página de configurações"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Existem chamadas ativas"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "está a telefonar-lhe!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Chamada recebida"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Novo pedido de"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Confiar no pedido"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nova mensagem"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Parar a chamada atual?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Limpar histórico"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Quer mesmo eliminar o histórico desta conversação?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Remover conversação"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Quer mesmo remover esta conversação?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bloquear contacto"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Quer mesmo bloquear este contacto?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Enviar"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Não foi possível iniciar.\nCertifique-se que o processo Jami (dring) está a ser executado.\nErro: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Erro Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Mostrar Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Sair"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
diff --git a/po/ring-client-gnome.pot b/po/ring-client-gnome.pot
index 3e7e16d6a45abc72171fd7177ce101e6db3eca50..d522404d0b35c88ca50a5bb073f918b6619844d0 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: 2019-11-11 03:09-0500\n"
+"POT-Creation-Date: 2019-11-18 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"
@@ -17,18 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr ""
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr ""
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr ""
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr ""
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529 ui/messagingwidget.ui:29
-#: src/chatview.cpp:344
+#: src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -366,11 +383,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr ""
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr ""
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr ""
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr ""
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/notifier.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/notifier.cpp:344 src/notifier.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/notifier.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/notifier.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the "
-"layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary "
+"instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary "
-"instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the "
+"layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr ""
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index b3ec22dd847338fae85477ca30a89d5e87e0c4e4..7c576092d16195e5765bd2fafb6a40d797cc032b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/jami/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr ""
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -159,6 +147,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr ""
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "General"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr ""
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Setari"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr ""
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Solicitări de contact"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -247,7 +264,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr ""
 
@@ -366,11 +383,6 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr ""
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -378,7 +390,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -441,6 +453,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr ""
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr ""
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -533,30 +557,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr ""
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "General"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Setari"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr ""
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Solicitări de contact"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -924,48 +924,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr ""
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Refuză"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1027,16 +985,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr ""
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Refuză"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1057,7 +1053,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1069,7 +1065,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1091,97 +1087,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Apel de intrare"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1197,6 +1102,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr ""
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1241,20 +1160,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr ""
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1281,7 +1186,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr ""
@@ -1302,51 +1207,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Apel de intrare"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr ""
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1354,7 +1354,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 1fbd3209d07719067c370f66ab80a692a3076cbe..4341e5d52ac70f9067dcc7a10d869b174d869e95 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/jami/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -40,18 +40,6 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Комбинации _клавиш"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_О программе"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Выход"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -182,6 +170,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Написать в новой строке"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Меню"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Общие"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Медиа"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Аккаунт"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Настройки"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Разговоры"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Запросы на добавление в контакты"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Необходим перенос аккаунта"
@@ -270,7 +287,7 @@ msgid "Toggle recording"
 msgstr "Начать/остановить запись"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Запись"
 
@@ -389,11 +406,6 @@ msgstr "Далее"
 msgid "Profile"
 msgstr "Профиль"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Аккаунт"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Зарегистрировать имя пользователя"
@@ -401,9 +413,9 @@ msgstr "Зарегистрировать имя пользователя"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Отметив это, вы зарегистрируете уникальное имя пользователя в сети Jami. Его можно будет использовать для связи с вами вместо RingID длиной в 40 символов."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -464,6 +476,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Войти"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Комбинации _клавиш"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_О программе"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Выход"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Система"
@@ -556,30 +580,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR-код"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Меню"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Общие"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Медиа"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Настройки"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Разговоры"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Запросы на добавление в контакты"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Настройки звука"
@@ -947,48 +947,6 @@ msgstr "Вернуться"
 msgid "Set selection as image"
 msgstr "Установить выбранное в качестве изображения"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Инициализация не выполнена.\nУбедитесь, что демон Jami (dring) запущен.\nОшибка: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Ошибка Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Показать Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Выход"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Открыть разговор"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Принять"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Отказать"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Отклонить"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Зарегистрировать это имя на сервере имён"
@@ -1050,16 +1008,54 @@ msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Отмена"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Сохранить"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Это ваше имя пользователя Jami.\nСкопируйте и поделитесь им с друзьями!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Это ваш ID.\nСкопируйте и поделитесь им с друзьями!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Открыть разговор"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Принять"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Отказать"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Отклонить"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Показать _область экрана"
@@ -1080,7 +1076,7 @@ msgstr "Показать дополнительную информацию"
 msgid "Open Avatar Image"
 msgstr "Открыть изображение аватара"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -1092,9 +1088,9 @@ msgstr "Выполняю…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nсобрано %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1114,97 +1110,6 @@ msgstr "Остановить запись"
 msgid "Send recorded message"
 msgstr "Отправить записанное сообщение"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Добавить аккаунт…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "позвонить"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "открыть чат"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - необходима миграция"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Идет миграция... пожалуйста, не закрывайте это окно."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Найти или начать разговор"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Выйти из настроек"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Есть активные звонки"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "звонит вам!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Входящий вызов"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Новый запрос от"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Запрос доверия"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Новое сообщение"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Завершить текущий звонок?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Очистить историю"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Вы действительно хотите очистить историю этой переписки? "
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Удалить диалог"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Вы действительно хотите удалить этой переписку? "
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Заблокировать контакт"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Вы действительно хотите заблокировать этот контакт?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1220,6 +1125,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Не удалось переподключиться к демону Jami (dring).\nЗавершение работы Jami."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Включить отладку"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Восстанавливает скрытое состояние главного окна (только для первичного процесса)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- клиент GNOME для Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Сделать _видеозвонок"
@@ -1264,20 +1183,6 @@ msgstr "_Профиль"
 msgid "(None)"
 msgstr "(нет)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Включить отладку"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Восстанавливает скрытое состояние главного окна (только для первичного процесса)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- клиент GNOME для Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "При создании учетной записи произошла ошибка."
@@ -1304,7 +1209,7 @@ msgstr "Пароли не совпадают"
 msgid "Import from backup"
 msgstr "Импортировать из резервной копии"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Сохранить файл"
@@ -1325,51 +1230,146 @@ msgstr "Аккаунт экспортирован!"
 msgid "Export account failure."
 msgstr "Экспорт аккаунта не выполнен."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Это ваше имя пользователя Jami.\nСкопируйте и поделитесь им с друзьями!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Добавить аккаунт…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Это ваш ID.\nСкопируйте и поделитесь им с друзьями!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "позвонить"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "открыть чат"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - необходима миграция"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Идет миграция... пожалуйста, не закрывайте это окно."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Найти или начать разговор"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Выйти из настроек"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Есть активные звонки"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "звонит вам!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Входящий вызов"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Новый запрос от"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Запрос доверия"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Новое сообщение"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Завершить текущий звонок?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Очистить историю"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Вы действительно хотите очистить историю этой переписки? "
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Удалить диалог"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Вы действительно хотите удалить этой переписку? "
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Заблокировать контакт"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Вы действительно хотите заблокировать этот контакт?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Повторить"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Отправить"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Инициализация не выполнена.\nУбедитесь, что демон Jami (dring) запущен.\nОшибка: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Ошибка Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Показать Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Выход"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Текущая конференция (все аккаунты)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Текущие звонки (все аккаунты)"
 
@@ -1377,7 +1377,7 @@ msgstr "Текущие звонки (все аккаунты)"
 msgid "Online contacts"
 msgstr "Интернет контакты"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Автоматически"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 35735c7ede1bf2231e6cde0c0e5602398d83e76f..67ebf4beaba0fddbd1d3897b6152e3f9b3054bde 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/jami/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_О программе"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Выход"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -165,6 +153,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Меню"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Основные"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Медиа"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Учётная запись"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Настройки"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Разговоры"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Запросы на добавление в контакты"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Необходим перенос аккаунта"
@@ -253,7 +270,7 @@ msgid "Toggle recording"
 msgstr "Начать/остановить запись"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Запись"
 
@@ -343,7 +360,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:287
 msgid "PIN"
-msgstr ""
+msgstr "PIN"
 
 #: ui/accountcreationwizard.ui:349
 msgid ""
@@ -372,11 +389,6 @@ msgstr "Далее"
 msgid "Profile"
 msgstr "Профиль"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Учётная запись"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Зарегистрировать имя пользователя"
@@ -384,9 +396,9 @@ msgstr "Зарегистрировать имя пользователя"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Отмечая это, вы зарегистрируете уникальное имя пользователя в сети Jami. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -447,6 +459,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_О программе"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Выход"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Система"
@@ -539,30 +563,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Меню"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Основные"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Медиа"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Настройки"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Разговоры"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Запросы на добавление в контакты"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Настройки звука"
@@ -930,48 +930,6 @@ msgstr "Вернуться"
 msgid "Set selection as image"
 msgstr "Установить выбранное в качестве изображения"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Инициализация не выполнена.\nУбедитесь, что демон Jami (dring) запущен.\nОшибка: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Ошибка Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Показать Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Выход"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Открыть разговор"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Принять"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Отказать"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Отклонить"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Зарегистрировать это имя на сервере имён"
@@ -1033,16 +991,54 @@ msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Отмена"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Сохранить"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Это ваше имя пользователя Jami.\nСкопируйте и поделитесь им со своими друзьями!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Это ваш ID.\nСкопируйте и поделитесь им с вашими друзьями!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Открыть разговор"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Принять"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Отказать"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Отклонить"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Показать _область экрана"
@@ -1063,7 +1059,7 @@ msgstr "Показать дополнительную информацию"
 msgid "Open Avatar Image"
 msgstr "Открыть изображение аватара"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -1075,9 +1071,9 @@ msgstr "Выполняю…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nсобрано %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1097,97 +1093,6 @@ msgstr "Остановить запись"
 msgid "Send recorded message"
 msgstr "Отправить записанное сообщение"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Добавить аккаунт…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "позвонить"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "открыть чат"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Выйти из настроек"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Есть активные звонки"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "звонит вам!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Входящий вызов"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Новый запрос от "
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Запрос доверия"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Новое сообщение"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Завершить текущий звонок?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Очистить историю"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Заблокировать контакт"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1203,6 +1108,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Не удалось переподключиться к демону Jami (dring).\nЗавершение работы Jami."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Включить отладку"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Восстанавливает скрытое состояние главного окна (только для первичного процесса)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- клиент GNOME для Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Сделать _видеозвонок"
@@ -1245,21 +1164,7 @@ msgstr ""
 
 #: src/profileview.cpp:111
 msgid "(None)"
-msgstr ""
-
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Включить отладку"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Восстанавливает скрытое состояние главного окна (только для первичного процесса)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- клиент GNOME для Jami"
+msgstr "(Никто)"
 
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
@@ -1287,7 +1192,7 @@ msgstr "Пароли не совпадают"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Сохранить файл"
@@ -1308,51 +1213,146 @@ msgstr "Аккаунт экспортирован!"
 msgid "Export account failure."
 msgstr "Экспорт аккаунта не выполнен."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Это ваше имя пользователя Jami.\nСкопируйте и поделитесь им со своими друзьями!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Добавить аккаунт…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Это ваш ID.\nСкопируйте и поделитесь им с вашими друзьями!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "позвонить"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "открыть чат"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Выйти из настроек"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Есть активные звонки"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "звонит вам!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Входящий вызов"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Новый запрос от "
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Запрос доверия"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Новое сообщение"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Завершить текущий звонок?"
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Очистить историю"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Заблокировать контакт"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Отправть"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Инициализация не выполнена.\nУбедитесь, что демон Jami (dring) запущен.\nОшибка: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Ошибка Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Показать Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Выход"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1360,7 +1360,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Автоматически"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 70ca3c8bc1da5b40daca772d90a2a906bcd16300..c18bf19da3609d941aa39030f0d2a6ebe4729dc4 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/jami/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,18 +19,6 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Informácie"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Ukončiť"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -161,6 +149,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Všeobecné"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Médiá"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Účet"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Nastavenia"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Konverzácie"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Žiadosti o spojenie"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Je vyžadovaná migrácia účtu"
@@ -249,7 +266,7 @@ msgid "Toggle recording"
 msgstr "Prepnúť zaznamenávanie"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Zaznamenať"
 
@@ -368,11 +385,6 @@ msgstr "Ďalej"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Účet"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrovať používateľské meno"
@@ -380,9 +392,9 @@ msgstr "Registrovať používateľské meno"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Zaškrtnutím tejto možnosti si zaregistrujete používateľské meno na sieti Jami. Ľudom na kontakt s vami postačí použiť toto meno namiesto vášho RingID, ktoré má 40 znakov."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -443,6 +455,18 @@ msgstr "Ok"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Informácie"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Ukončiť"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Systém"
@@ -535,30 +559,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Všeobecné"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Médiá"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Nastavenia"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Konverzácie"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Žiadosti o spojenie"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Nastavenia zvuku"
@@ -926,48 +926,6 @@ msgstr "Vrátiť"
 msgid "Set selection as image"
 msgstr "Použiť výber ako obrázok"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Nepodarila sa inicializácia.\nUistite sa, že je spustený Jami daemon (dring).\nChyba: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Chyba Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Zobraziť Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Ukončiť"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Otvoriť konverzáciu"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Prijať"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Odmietnuť"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Odmietnuť"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registrovať používateľské meno na tomto serveri"
@@ -1029,16 +987,54 @@ msgid "Choose download folder"
 msgstr "Zvoliť priečinok na sťahovanie"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Uložiť"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Toto je vaše Jami používateľské meno.\nSkopírujte ho a zdieľajte s priateľmi!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Toto je vaše ID.\nSkopírujte ho a zdieľajte s priateľmi!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami je slobodný softvér na univerzálnu komunikáciu, ktorý rešpektuje slobody a súkromie používateľov."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Otvoriť konverzáciu"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Prijať"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Odmietnuť"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Odmietnuť"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Zdieľať _oblasť obrazovky"
@@ -1059,7 +1055,7 @@ msgstr "Ukázať pokročilé informácie"
 msgid "Open Avatar Image"
 msgstr "Otvoriť obrázok avatara"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Otvoriť"
 
@@ -1071,9 +1067,9 @@ msgstr "Vykonávanie..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Žiť v slobode alebo umrieť\"\npostavené na %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1093,97 +1089,6 @@ msgstr "Ukončiť zaznamenávanie"
 msgid "Send recorded message"
 msgstr "Poslať zaznamenanú správu"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Pridať účet..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "uskutočniť hovor"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "otvoriť chat"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Opustiť nastavenia"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "vám volá!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Prichádzajúci hovor"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Nová žiadosť od"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Veriť žiadosti"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nová správa"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Vymazať históriu"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Zablokovať kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1199,6 +1104,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Nepodarilo sa znovupripojenie k daemonovi Jami (dring).\nJami sa teraz vypne."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Zapnúť ladenie"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Obnovuje skrytý stav hlavného okna (iba v prípade primárnej inštancie)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME klient pre Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Uskutočniť _video hovor"
@@ -1243,20 +1162,6 @@ msgstr ""
 msgid "(None)"
 msgstr "(Žiadny)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Zapnúť ladenie"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Obnovuje skrytý stav hlavného okna (iba v prípade primárnej inštancie)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- GNOME klient pre Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1283,7 +1188,7 @@ msgstr "Heslá sa nezhodujú"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Uložiť súbor"
@@ -1304,51 +1209,146 @@ msgstr "Účet exportovaný!"
 msgid "Export account failure."
 msgstr "Zlyhanie exportu účtu."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Toto je vaše Jami používateľské meno.\nSkopírujte ho a zdieľajte s priateľmi!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Pridať účet..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Toto je vaše ID.\nSkopírujte ho a zdieľajte s priateľmi!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "uskutočniť hovor"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "otvoriť chat"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Opustiť nastavenia"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "vám volá!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Prichádzajúci hovor"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Nová žiadosť od"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Veriť žiadosti"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nová správa"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami je slobodný softvér na univerzálnu komunikáciu, ktorý rešpektuje slobody a súkromie používateľov."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Vymazať históriu"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Zablokovať kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Poslať súbor"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stop"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Poslať"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Nepodarila sa inicializácia.\nUistite sa, že je spustený Jami daemon (dring).\nChyba: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Chyba Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Zobraziť Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Ukončiť"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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 "Varovanie! Táto akcia odstráni účet z tohto zariadenia!\nPoznámka: Výsledok tejto akcie je permanentný. Môžete tiež stratiť vaše zaregistrované meno!"
 
-#: src/currentcallview.cpp:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/sl.po b/po/sl.po
index d6a6c4c421135a40b3e4a6004bc280abb099dbfb..bdbec1e0431f8d36e66f176d4206559e014ea9af 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/jami/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_O programu"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Izhod"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Meni"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Splošno"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Mediji"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Račun"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Pogovori"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Zahteve za povezavo"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Potrebna je migracija računa"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Snemaj"
 
@@ -367,11 +384,6 @@ msgstr "Naprej"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Račun"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -379,7 +391,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -442,6 +454,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_O programu"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Izhod"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistem"
@@ -534,30 +558,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Meni"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Splošno"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Mediji"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Pogovori"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Zahteve za povezavo"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Avdio nastavitve"
@@ -925,48 +925,6 @@ msgstr "Nazaj"
 msgid "Set selection as image"
 msgstr "Določi izbrano za sliko"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Sprejmi"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Zavrni"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Zavrni"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Prekliči"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Sprejmi"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Zavrni"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Zavrni"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1058,7 +1054,7 @@ msgstr "Prikaži napredne informacije"
 msgid "Open Avatar Image"
 msgstr "Odpri avatar sliko"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Odpri"
 
@@ -1070,7 +1066,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1092,97 +1088,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "izvedi klic"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "odpri pogovor"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Dohodni klic"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Pobriši zgodovino"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Omogoči razhroščevanje"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1242,20 +1161,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Omogoči razhroščevanje"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1282,7 +1187,7 @@ msgstr "Gesli nista enaki"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Shrani datoteko"
@@ -1303,51 +1208,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "izvedi klic"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "odpri pogovor"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Dohodni klic"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Pobriši zgodovino"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Pošlji"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1355,7 +1355,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Samodejno"
diff --git a/po/sq_AL.po b/po/sq_AL.po
index ad3442b21ee87beb384aaa6cde2ad23e037ee2de..092a2814925b5a87ec5f6f136c26a7d9cd165e8a 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/jami/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: sq_AL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "_Shkurtore Tastiere"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Rreth"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Dil"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Shkruani një rresht të ri"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menu"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Të përgjithshme"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Llogari"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Rregullime"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Biseda"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kërkesa kontakti"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Lyp migrim llogarie"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr "Shfa/fshih incizim"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Regjistroje"
 
@@ -367,11 +384,6 @@ msgstr "Pasuesi"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Llogari"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Regjistroni emër përdoruesi"
@@ -379,9 +391,9 @@ msgstr "Regjistroni emër përdoruesi"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Duke i vënë shenjë kësaj, do të regjistroni një emër përdoruesi unik në rrjetin Jami. 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:625
 msgid ""
@@ -442,6 +454,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Hyni"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "_Shkurtore Tastiere"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Rreth"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Dil"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Sistem"
@@ -534,30 +558,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "Kod QR"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menu"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Të përgjithshme"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Rregullime"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Biseda"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kërkesa kontakti"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Rregullime për Video"
@@ -925,48 +925,6 @@ msgstr "Kthehu"
 msgid "Set selection as image"
 msgstr "Si figurë cakto përzgjedhjen"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "S’arrihet të gatitet.\nSigurohuni që demoni Jami (dring) është në punë e sipër.\nGabim: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Gabim Jami"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Shfaq Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Dilni"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Hap bisedë"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Pranoje"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Hidhe tej"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Hidhe tej"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Regjistroje këtë emër përdoruesi te shërbyesi i emrave"
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr "Zgjidhni dosje shkarkimesh"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Anuloje"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Ruaje"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Ky është emri juaj i përdoruesit në Jami.\nKopjojeni dhe jepuani shokëve!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Kjo është ID-ja juaj.\nKopjojeni dhe jepuani shokëve!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Hap bisedë"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Pranoje"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Hidhe tej"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Hidhe tej"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Ndani me të tjerë zonë _ekrani"
@@ -1058,7 +1054,7 @@ msgstr "Shfaq informacion të thelluar"
 msgid "Open Avatar Image"
 msgstr "Hap Figurë Avatari"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Hape"
 
@@ -1070,9 +1066,9 @@ msgstr "Po punohet…"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\nngritur mbi %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1092,97 +1088,6 @@ msgstr "Ndale incizimin"
 msgid "Send recorded message"
 msgstr "Dërgo mesazhin e incizuar"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Shtoni llogari…"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "bëni një thirrje"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "hape fjalosjen"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - Lypset migrim"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migrim në kryerje e sipër… ju lutemi, mos e mbyllni këtë dritare."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Gjeni ose filloni një bisedë"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Braktise faqen e rregullimeve"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Ka thirrje aktive"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr " po ju thërret!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Thirrje ardhëse"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Kërkesë e re nga "
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Kërkesë besueshmërie"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Mesazh i ri"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Të ndalet thirrja e tanishme?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Ka një thirrje në kryerje e sipër. Doni të mbyllet dritarja dhe të ndalen krejt thirrjet e tanishme?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Spastroje historikun"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Doni të spastrohet vërtet historiku i kësaj bisede?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Hiqe bisedën"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Doni të hiqet vërtet kjo bisedë?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Bllokojeni kontaktin"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Doni të bllokohet vërtet ky kontakt?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr "S’u rilidh dot me demonin Jami (dring).\nJami tani do të dalë."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Aktivizo diagnostikim"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Rikthen gjendjen e fshehur të dritares kryesore (e zbatueshme vetëm për instancën parësore)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Klienti Jami për GNOME"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Bëni thirrje _video"
@@ -1242,20 +1161,6 @@ msgstr "_Profil"
 msgid "(None)"
 msgstr "(Asnjë)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Aktivizo diagnostikim"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "- Klienti Jami për GNOME"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Ndodhi një gabim gjatë krijimit të llogarisë."
@@ -1267,7 +1172,7 @@ msgstr "S’merret dot ndonjë llogari, ju lutemi, verifikoni PIN-in tuaj dhe fj
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "S’merret dot ndonjë llogari, ju lutemi, verifikoni arkivin tuaj dhe fjalëkalimin tuaj."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1282,7 +1187,7 @@ msgstr "Fjalëkalimet nuk përputhen"
 msgid "Import from backup"
 msgstr "Importoni prej kopjeruajtjeje"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Ruaje Kartelën"
@@ -1303,51 +1208,146 @@ msgstr "Llogaria u eksportua!"
 msgid "Export account failure."
 msgstr "Dështim eksportimi llogarie."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Ky është emri juaj i përdoruesit në Jami.\nKopjojeni dhe jepuani shokëve!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Shtoni llogari…"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Kjo është ID-ja juaj.\nKopjojeni dhe jepuani shokëve!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "bëni një thirrje"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "hape fjalosjen"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - Lypset migrim"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migrim në kryerje e sipër… ju lutemi, mos e mbyllni këtë dritare."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Gjeni ose filloni një bisedë"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Braktise faqen e rregullimeve"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Ka thirrje aktive"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr " po ju thërret!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Thirrje ardhëse"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Kërkesë e re nga "
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Kërkesë besueshmërie"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Mesazh i ri"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Të ndalet thirrja e tanishme?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Ka një thirrje në kryerje e sipër. Doni të mbyllet dritarja dhe të ndalen krejt thirrjet e tanishme?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Spastroje historikun"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Doni të spastrohet vërtet historiku i kësaj bisede?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Hiqe bisedën"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Doni të hiqet vërtet kjo bisedë?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Bllokojeni kontaktin"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Doni të bllokohet vërtet ky kontakt?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Dërgo Kartelë"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Riprovoni"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Ndale"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Dërgoje"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "S’arrihet të gatitet.\nSigurohuni që demoni Jami (dring) është në punë e sipër.\nGabim: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Gabim Jami"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Shfaq Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Dilni"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Konferenca e tanishme (krejt llogaritë)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Thirrja e tanishme (krejt llogaritë)"
 
@@ -1355,7 +1355,7 @@ msgstr "Thirrja e tanishme (krejt llogaritë)"
 msgid "Online contacts"
 msgstr "Kontakte <em>online</em>"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/sv.po b/po/sv.po
index 00078a19f1262eb895fcc4ddcf3fdebe43936103..17bbd447af28c86f9e15294a78120b956694ee5b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/jami/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,18 +18,6 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "Tangentbords_genvägar"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "­_Om"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Avsluta"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -160,6 +148,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "Skriv på en ny rad"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Meny"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Allmänt"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Media"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Konto"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Inställningar"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Konversationer"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Kontaktförfrågningar"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Kontomigrering krävs"
@@ -248,7 +265,7 @@ msgid "Toggle recording"
 msgstr "Inspelning av/på"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Spela in"
 
@@ -367,11 +384,6 @@ msgstr "Nästa"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Konto"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Registrera användarnamn"
@@ -379,9 +391,9 @@ msgstr "Registrera användarnamn"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Genom att aktivera detta, registrerar du ett unikt användarnamn på Jami-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:625
 msgid ""
@@ -442,6 +454,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr "Logga in"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "Tangentbords_genvägar"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "­_Om"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Avsluta"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "System"
@@ -534,30 +558,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR-kod"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Meny"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Allmänt"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Media"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Konversationer"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Kontaktförfrågningar"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Ljudinställningar"
@@ -925,48 +925,6 @@ msgstr "Återvänd"
 msgid "Set selection as image"
 msgstr "Ange markerat som bild"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Kan inte starta.\nTillse att Jami-tjänsten (dring) körs.\nFel: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami-fel"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Visa Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Avsluta"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Öppna konversation"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Acceptera"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Neka"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Avslå"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Registrera detta namn i namnservern"
@@ -1028,16 +986,54 @@ msgid "Choose download folder"
 msgstr "Välj nerladdningsmapp"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Spara"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Detta är ditt Jami-användarnamn.\nKopiera och dela det med dina vänner!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Detta är ditt ID.\nKopiera och dela det med dina vänner!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Öppna konversation"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Acceptera"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Neka"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Avslå"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "Dela _skärmområde"
@@ -1058,7 +1054,7 @@ msgstr "Visa avancerad information"
 msgid "Open Avatar Image"
 msgstr "Öppna avatarbild"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -1070,9 +1066,9 @@ msgstr "Arbetar..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Lev fritt eller dö\"\nkompilerat %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1092,97 +1088,6 @@ msgstr "Sluta spela in"
 msgid "Send recorded message"
 msgstr "Skicka inspelat meddelande"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Lägg till konto..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "Placera samtal"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "Öppna chatt"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - Migrering behövs"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "Migrering pågår... stäng inte detta fönster."
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "Hitta eller starta en konversation"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Lämna inställningssidan"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "Det finns aktiva samtal"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr " ringer dig!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Inkommande samtal"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "Ny förfrågan från"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Lita på begäran"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Nytt meddelande"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "Vill du stoppa aktuellt samtal?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "Det finns ett pågående samtal. Vill du stänga fönstret och stoppa alla aktuella samtal?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Rensa historik"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "Vill du verkligen ta bort historiken för den här konversationen?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "Ta bort konversationen"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "Vill du verkligen ta bort den här konversationen?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Blockera kontakt"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "Vill du verkligen blockera den här kontakten?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1198,6 +1103,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Kunde inte återansluta till Jami-tjänsten (dring).\nJami kommer nu att avslutas."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Aktivera felsökning"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Återställer dold status för huvudfönstret (applicerbart endast på primär instans)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME-klient för Jami"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "Placera  _videosamtal"
@@ -1242,20 +1161,6 @@ msgstr "_Profil"
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Aktivera felsökning"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr "- GNOME-klient för Jami"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "Ett fel inträffade när kontot skulle skapas."
@@ -1267,7 +1172,7 @@ msgstr "Kan inte hämta något konto, verifiera din PIN-kod och ditt lösenord."
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "Kan inte hämta något konto, verifiera ditt arkiv och ditt lösenord."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1282,7 +1187,7 @@ msgstr "Lösenorden stämmer inte"
 msgid "Import from backup"
 msgstr "Importera från säkerhetskopia"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Spara fil"
@@ -1303,51 +1208,146 @@ msgstr "Konto exporterat!"
 msgid "Export account failure."
 msgstr "Kontoexport misslyckades."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Detta är ditt Jami-användarnamn.\nKopiera och dela det med dina vänner!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Lägg till konto..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Detta är ditt ID.\nKopiera och dela det med dina vänner!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "Placera samtal"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "Öppna chatt"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - Migrering behövs"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "Migrering pågår... stäng inte detta fönster."
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "Hitta eller starta en konversation"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Lämna inställningssidan"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "Det finns aktiva samtal"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr " ringer dig!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Inkommande samtal"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "Ny förfrågan från"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Lita på begäran"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Nytt meddelande"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "Vill du stoppa aktuellt samtal?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "Det finns ett pågående samtal. Vill du stänga fönstret och stoppa alla aktuella samtal?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Rensa historik"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "Vill du verkligen ta bort historiken för den här konversationen?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "Ta bort konversationen"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "Vill du verkligen ta bort den här konversationen?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Blockera kontakt"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "Vill du verkligen blockera den här kontakten?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Försök igen"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Skicka"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Kan inte starta.\nTillse att Jami-tjänsten (dring) körs.\nFel: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami-fel"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Visa Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Avsluta"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "Aktuell konferens (alla konton)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "Aktuella samtal (alla konton)"
 
@@ -1355,7 +1355,7 @@ msgstr "Aktuella samtal (alla konton)"
 msgid "Online contacts"
 msgstr "Anslutna kontakter"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
diff --git a/po/tr.po b/po/tr.po
index 55797c9ddad84289f9ef503fc2eb6529ddec7269..f930906c1d5c126ec967190721798d7d5675656d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/jami/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,18 +23,6 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Hakkında"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Çıkış"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -165,6 +153,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Menü"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Genel"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Ortam"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Hesap"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Konuşmalar"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "İletişim istekleri"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Hesap taşıma gerekli"
@@ -253,7 +270,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Kaydet"
 
@@ -372,11 +389,6 @@ msgstr "İleri"
 msgid "Profile"
 msgstr "Profil"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Hesap"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "Kullanıcı adını kaydet"
@@ -384,9 +396,9 @@ msgstr "Kullanıcı adını kaydet"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Bunu seçerek Jami ağı üzerinde benzersiz bir kullanıcı adı kayıt olacaksınız. İnsanlar 40 karakter uzunluğundaki Jami Kimliğiniz yerine bunu kullanarak sizinle iletişime geçebilecek."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -447,6 +459,18 @@ msgstr "TAMAM"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Hakkında"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Çıkış"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Düzen"
@@ -539,30 +563,6 @@ msgstr "Kimlik"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Menü"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Genel"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Ortam"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Konuşmalar"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "İletişim istekleri"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Ses Ayarları"
@@ -930,48 +930,6 @@ msgstr "Geri dön"
 msgid "Set selection as image"
 msgstr "Seçimi görüntü olarak belirle"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami Hatası"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Jami'yi Göster"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "Çıkış"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "Konuşma aç"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Kabul et"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Geri Çevir"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Reddet"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "Bu kullanıcı adını ad sunucusuna kaydet"
@@ -1033,16 +991,54 @@ msgid "Choose download folder"
 msgstr "İndirme klasörünü seçin"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_İptal"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "_Kaydet"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Bu sizin Jami kullanıcı adınız.\nKopyalayın ve arkadaşlarınızla paylaşın!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "Kopyalayın ve arkadaşlarınızla paylaşın!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami, 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/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "Konuşma aç"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Kabul et"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Geri Çevir"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Reddet"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1063,7 +1059,7 @@ msgstr "İleri bilgileri göster"
 msgid "Open Avatar Image"
 msgstr "Avatar Resmi Aç"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Aç"
 
@@ -1075,7 +1071,7 @@ msgstr "Çalışıyor..."
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1097,97 +1093,6 @@ msgstr "Kaydı durdur"
 msgid "Send recorded message"
 msgstr "Kaydedilmiş iletiyi gönder"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "Hesap ekle..."
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "ara"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "konuşma aç"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "Ayarlar sayfasından ayrıl"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "seni arıyor!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Gelen arama"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "Güven isteği"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "Yeni ileti"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Geçmişi temizle"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Kişiyi engelle"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1203,6 +1108,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Hata ayıklayıcıyı etkinleştir"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Ana pencerenin gizli durumunu eski haline döndürür (sadece birincil oluşum için geçerli)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1247,20 +1166,6 @@ msgstr ""
 msgid "(None)"
 msgstr "(Hiçbiri)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Hata ayıklayıcıyı etkinleştir"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-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 Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1287,7 +1192,7 @@ msgstr "Parolalar uyuşmuyor"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Dosyayı Kaydet"
@@ -1308,51 +1213,146 @@ msgstr "Hesap dışa aktarıldı!"
 msgid "Export account failure."
 msgstr "Hesap dışa aktarımı başarısız."
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Bu sizin Jami kullanıcı adınız.\nKopyalayın ve arkadaşlarınızla paylaşın!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "Hesap ekle..."
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "Kopyalayın ve arkadaşlarınızla paylaşın!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "ara"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "konuşma aç"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "Ayarlar sayfasından ayrıl"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "seni arıyor!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Gelen arama"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "Güven isteği"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "Yeni ileti"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami, kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Geçmişi temizle"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Kişiyi engelle"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Yeniden dene"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Durdur"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Gönder"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami Hatası"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Jami'yi Göster"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "Çıkış"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1360,7 +1360,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Kendiliğinden"
diff --git a/po/uk.po b/po/uk.po
index 1cf946fa54928b21806f59d3d4c53a28baec8a73..46c782bc82a555bd61e7cd17fd093dc59ac281bd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/jami/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -25,18 +25,6 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_Про програму"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_Вихід"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -167,6 +155,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "Меню"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "Головні"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "Медіа"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "Аккаунт"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "Налаштування"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "Групові чати"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "Запити контактів"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "Необхідно перевести обліковий запис"
@@ -255,7 +272,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "Запис"
 
@@ -374,11 +391,6 @@ msgstr "Наступний"
 msgid "Profile"
 msgstr "Профіль"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "Аккаунт"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -386,9 +398,9 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "Увімкнувши цю опцію, ви зареєструєте унікальне ім'я користувача в мережі Джамі. Люди можуть використовувати його замість вашого 40-значного ідентифікатора."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -449,6 +461,18 @@ msgstr "OK"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_Про програму"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_Вихід"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "Система"
@@ -541,30 +565,6 @@ msgstr "Ідентифікатор"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "Меню"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "Головні"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "Медіа"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "Налаштування"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "Групові чати"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "Запити контактів"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "Налаштування звуку"
@@ -932,48 +932,6 @@ msgstr "Повернутися"
 msgid "Set selection as image"
 msgstr "Встановити обране як зображення"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "Помилка ініціалізації.\nПереконайтеся, що сервіс Джамі (dring) працює.\nПомилка: %s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Збій Джамі"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "Показати Джамі"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "Прийняти"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "Скидання"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "Відхилити"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1035,16 +993,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "_Скасувати"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "Це ваше ім'я користувача Джамі.\nСкопіюйте й поділіться з вашими друзями!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Джамі — це вільне програмне забезпечення для будь-якого зв'язку з повагою до свобод і приватності користувачів."
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "Прийняти"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "Скидання"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "Відхилити"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1065,7 +1061,7 @@ msgstr "Показати додаткові відомості"
 msgid "Open Avatar Image"
 msgstr "Відкрити зображення Аватару."
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "_Відкрити"
 
@@ -1077,7 +1073,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1099,97 +1095,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "розпочати дзвінок"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "відкрити розмову"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "Вхідний дзвінок"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "Видалити історію"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "Заблокувати контакт"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1205,6 +1110,20 @@ msgid ""
 "Jami will now quit."
 msgstr "Не вдалося повторно з'єднатися з сервісом Джамі (dring).\nДжамі зараз закриється."
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "Увімкнути відладку"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "Відновлює сховане головне вікно (діє тільки для головної копії запущеної програми)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- GNOME клієнт для Джамі"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1249,20 +1168,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "Увімкнути відладку"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "Відновлює сховане головне вікно (діє тільки для головної копії запущеної програми)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- GNOME клієнт для Джамі"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1289,7 +1194,7 @@ msgstr "Паролі не збігаються"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "Зберегти файл"
@@ -1310,51 +1215,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "Це ваше ім'я користувача Джамі.\nСкопіюйте й поділіться з вашими друзями!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "розпочати дзвінок"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "відкрити розмову"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "Вхідний дзвінок"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Джамі — це вільне програмне забезпечення для будь-якого зв'язку з повагою до свобод і приватності користувачів."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "Видалити історію"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "Заблокувати контакт"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "Спробувати ще"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "Відправити"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "Помилка ініціалізації.\nПереконайтеся, що сервіс Джамі (dring) працює.\nПомилка: %s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Збій Джамі"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "Показати Джамі"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1362,7 +1362,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авто"
diff --git a/po/zh.po b/po/zh.po
index edbf66485b9df3c897022fee372e867dd9a5e7fb..bb1ec2ab125734607bdbde89d82e1206d0bf1bad 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/jami/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,6 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "_關於"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "_離開"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -162,6 +150,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "選單"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "通用"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "媒體"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "帳號"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "設定"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "對話"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr ""
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr ""
@@ -250,7 +267,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "錄製"
 
@@ -369,11 +386,6 @@ msgstr "下一步"
 msgid "Profile"
 msgstr "個人檔案"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "帳號"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -381,7 +393,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -444,6 +456,18 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "_關於"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "_離開"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr ""
@@ -536,30 +560,6 @@ msgstr ""
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "選單"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "通用"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "媒體"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "設定"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "對話"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr ""
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr ""
@@ -927,48 +927,6 @@ msgstr ""
 msgid "Set selection as image"
 msgstr ""
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr ""
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "拒絕"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr ""
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1030,16 +988,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr ""
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr ""
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "拒絕"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr ""
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1060,7 +1056,7 @@ msgstr ""
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr ""
 
@@ -1072,7 +1068,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1094,97 +1090,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr ""
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "來電"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1200,6 +1105,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "啟用除錯模式"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr ""
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1244,20 +1163,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "啟用除錯模式"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr ""
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1284,7 +1189,7 @@ msgstr ""
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "儲存檔案"
@@ -1305,51 +1210,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr ""
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr ""
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr ""
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "來電"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr ""
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr ""
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
 msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr ""
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "發送"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1357,7 +1357,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb766d5ce8da53f5060f073f65f27aecab2dd3c5..080cabb3fcb92e3de50e6c4eb580e7c7ea0df593 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/jami/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,6 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr ""
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "退出(_Q)"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -163,6 +151,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr ""
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "菜单"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "通用"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "媒体"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "帐户"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "设置"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "会话"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "联系人请求"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "需要帐户迁移"
@@ -251,7 +268,7 @@ msgid "Toggle recording"
 msgstr ""
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "录制"
 
@@ -370,11 +387,6 @@ msgstr "下一步"
 msgid "Profile"
 msgstr "帐户资料"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "帐户"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr ""
@@ -382,7 +394,7 @@ msgstr ""
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
 msgstr ""
 
@@ -445,6 +457,18 @@ msgstr "确定"
 msgid "Sign in"
 msgstr ""
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr ""
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "退出(_Q)"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "系统"
@@ -537,30 +561,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr ""
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "菜单"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "通用"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "媒体"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "设置"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "会话"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "联系人请求"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "音频设置"
@@ -928,48 +928,6 @@ msgstr "返回"
 msgid "Set selection as image"
 msgstr "设置选区为头像"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr ""
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr ""
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr ""
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr ""
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr ""
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "接听"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "拒接"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "拒接"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr ""
@@ -1031,16 +989,54 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr ""
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr ""
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami是一种自由通信软件,它尊重用户的自由和隐私。"
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr ""
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "接听"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "拒接"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "拒接"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr ""
@@ -1061,7 +1057,7 @@ msgstr "显示高级信息"
 msgid "Open Avatar Image"
 msgstr "打开头像图片"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -1073,7 +1069,7 @@ msgstr ""
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
 msgstr ""
 
@@ -1095,97 +1091,6 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr ""
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "拨出"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "发起聊天"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr ""
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "来电"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr ""
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "清除历史记录"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr ""
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "屏蔽联系人"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr ""
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1201,6 +1106,20 @@ msgid ""
 "Jami will now quit."
 msgstr ""
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "开启调试模式"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "恢复主窗口的隐藏状态(仅应用于主实例)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr ""
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr ""
@@ -1245,20 +1164,6 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "开启调试模式"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "恢复主窗口的隐藏状态(仅应用于主实例)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr ""
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr ""
@@ -1285,7 +1190,7 @@ msgstr "密码不匹配"
 msgid "Import from backup"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "保存文件"
@@ -1306,51 +1211,146 @@ msgstr ""
 msgid "Export account failure."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "拨出"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "发起聊天"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr ""
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr ""
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr ""
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr ""
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "来电"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr ""
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr ""
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr ""
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr ""
+
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami是一种自由通信软件,它尊重用户的自由和隐私。"
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr ""
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "清除历史记录"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr ""
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr ""
+
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "屏蔽联系人"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr ""
 
-#: src/chatview.cpp:277
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr ""
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr ""
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "停止"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "发送"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr ""
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr ""
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr ""
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr ""
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr ""
 
@@ -1358,7 +1358,7 @@ msgstr ""
 msgid "Online contacts"
 msgstr ""
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自动"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9546f16035ff5ec43c6fd157fbe881cbeb6ab276..b26a775c8eac01f6ea8331dde3568e4cc0bdd6ac 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-11 03:09-0500\n"
-"PO-Revision-Date: 2019-11-11 08:09+0000\n"
+"POT-Creation-Date: 2019-11-18 03:09-0500\n"
+"PO-Revision-Date: 2019-11-18 08:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/jami/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,6 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ui/ringgearsmenu.ui:7
-msgid "Keyboard _Shortcuts"
-msgstr "鍵盤快捷鍵(_S)"
-
-#: ui/ringgearsmenu.ui:11
-msgid "_About"
-msgstr "關於(_A)"
-
-#: ui/ringgearsmenu.ui:17
-msgid "_Quit"
-msgstr "結束(_Q)"
-
 #: ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
@@ -163,6 +151,35 @@ msgctxt "shortcut window"
 msgid "Write on a new line"
 msgstr "在新的一行上撰寫"
 
+#: ui/mainwindow.ui:57
+msgid "Menu"
+msgstr "選單"
+
+#: ui/mainwindow.ui:80
+msgid "General"
+msgstr "一般"
+
+#: ui/mainwindow.ui:96
+msgid "Media"
+msgstr "媒體"
+
+#: ui/mainwindow.ui:113 ui/accountcreationwizard.ui:523
+#: ui/newaccountsettingsview.ui:414
+msgid "Account"
+msgstr "帳號"
+
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1846
+msgid "Settings"
+msgstr "設定"
+
+#: ui/mainwindow.ui:271 ui/mainwindow.ui:278
+msgid "Conversations"
+msgstr "對話"
+
+#: ui/mainwindow.ui:304 ui/mainwindow.ui:311
+msgid "Contact requests"
+msgstr "加好友請求"
+
 #: ui/accountmigrationview.ui:20
 msgid "Account migration required"
 msgstr "需要帳號遷移"
@@ -251,7 +268,7 @@ msgid "Toggle recording"
 msgstr "切換錄製"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
-#: ui/messagingwidget.ui:29 src/chatview.cpp:344
+#: ui/messagingwidget.ui:29 src/chatview.cpp:345
 msgid "Record"
 msgstr "記錄"
 
@@ -370,11 +387,6 @@ msgstr "下一個"
 msgid "Profile"
 msgstr "設定檔"
 
-#: ui/accountcreationwizard.ui:523 ui/ringmainwindow.ui:113
-#: ui/newaccountsettingsview.ui:414
-msgid "Account"
-msgstr "帳號"
-
 #: ui/accountcreationwizard.ui:560
 msgid "Register username"
 msgstr "註冊使用者名稱"
@@ -382,9 +394,9 @@ msgstr "註冊使用者名稱"
 #: ui/accountcreationwizard.ui:561
 msgid ""
 "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 "
+"People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr "透過勾選這個,您將會在 Jami 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您,而不必使用長達 40 個字元的您的 RingID。"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -445,6 +457,18 @@ msgstr "確定"
 msgid "Sign in"
 msgstr "登入"
 
+#: ui/gearsmenu.ui:7
+msgid "Keyboard _Shortcuts"
+msgstr "鍵盤快捷鍵(_S)"
+
+#: ui/gearsmenu.ui:11
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ui/gearsmenu.ui:17
+msgid "_Quit"
+msgstr "結束(_Q)"
+
 #: ui/generalsettingsview.ui:51
 msgid "System"
 msgstr "系統"
@@ -537,30 +561,6 @@ msgstr "ID"
 msgid "QR Code"
 msgstr "QR Code"
 
-#: ui/ringmainwindow.ui:57
-msgid "Menu"
-msgstr "選單"
-
-#: ui/ringmainwindow.ui:80
-msgid "General"
-msgstr "一般"
-
-#: ui/ringmainwindow.ui:96
-msgid "Media"
-msgstr "媒體"
-
-#: ui/ringmainwindow.ui:150 src/ringmainwindow.cpp:1846
-msgid "Settings"
-msgstr "設定"
-
-#: ui/ringmainwindow.ui:271 ui/ringmainwindow.ui:278
-msgid "Conversations"
-msgstr "對話"
-
-#: ui/ringmainwindow.ui:304 ui/ringmainwindow.ui:311
-msgid "Contact requests"
-msgstr "加好友請求"
-
 #: ui/mediasettingsview.ui:24
 msgid "Audio Settings"
 msgstr "音效設定"
@@ -928,48 +928,6 @@ msgstr "恢復"
 msgid "Set selection as image"
 msgstr "設定選擇為圖片"
 
-#: src/ring_client.cpp:115
-#, c-format
-msgid ""
-"Unable to initialize.\n"
-"Make sure the Jami daemon (dring) is running.\n"
-"Error: %s"
-msgstr "無法初始化。\n請確定 Jami 幕後程式 (dring) 正在執行。\n錯誤:%s"
-
-#: src/ring_client.cpp:118
-msgid "Jami Error"
-msgstr "Jami 錯誤"
-
-#: src/ring_client.cpp:395
-msgctxt ""
-"In the status icon menu, toggle action to show or hide the Jami main window"
-msgid "Show Jami"
-msgstr "顯示 Jami"
-
-#: src/ring_client.cpp:399
-msgid "Quit"
-msgstr "結束"
-
-#: src/ringnotify.cpp:336
-msgctxt ""
-msgid "Open conversation"
-msgstr "開啟對話"
-
-#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
-msgctxt ""
-msgid "Accept"
-msgstr "接聽"
-
-#: src/ringnotify.cpp:351
-msgctxt ""
-msgid "Refuse"
-msgstr "拒絕"
-
-#: src/ringnotify.cpp:367
-msgctxt ""
-msgid "Decline"
-msgstr "拒絕"
-
 #: src/usernameregistrationbox.cpp:163 src/usernameregistrationbox.cpp:186
 msgid "Register this username on the name server"
 msgstr "在名稱伺服器上註冊這個使用者名稱"
@@ -1031,16 +989,54 @@ msgid "Choose download folder"
 msgstr "選擇下載資料夾"
 
 #: src/generalsettingsview.cpp:224 src/avatarmanipulation.cpp:414
-#: src/accountcreationwizard.cpp:757 src/chatview.cpp:280
+#: src/accountcreationwizard.cpp:757 src/chatview.cpp:281
 #: src/newaccountsettingsview.cpp:936
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: src/generalsettingsview.cpp:226 src/accountcreationwizard.cpp:759
-#: src/chatview.cpp:282 src/newaccountsettingsview.cpp:938
+#: src/chatview.cpp:283 src/newaccountsettingsview.cpp:938
 msgid "_Save"
 msgstr "儲存(_S)"
 
+#: src/welcomeview.cpp:92
+msgid ""
+"This is your Jami username.\n"
+"Copy and share it with your friends!"
+msgstr "這是你的 Jami 使用者名稱。\n複製並與你的朋友分享!"
+
+#: src/welcomeview.cpp:100
+msgid ""
+"This is your ID.\n"
+"Copy and share it with your friends!"
+msgstr "這是你的 ID.\n複製並與你的朋友分享!"
+
+#: src/welcomeview.cpp:195
+msgid ""
+"Jami is free software for universal communication which respects the "
+"freedoms and privacy of its users."
+msgstr "Jami 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。"
+
+#: src/notifier.cpp:336
+msgctxt ""
+msgid "Open conversation"
+msgstr "開啟對話"
+
+#: src/notifier.cpp:344 src/notifier.cpp:360
+msgctxt ""
+msgid "Accept"
+msgstr "接聽"
+
+#: src/notifier.cpp:351
+msgctxt ""
+msgid "Refuse"
+msgstr "拒絕"
+
+#: src/notifier.cpp:367
+msgctxt ""
+msgid "Decline"
+msgstr "拒絕"
+
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
 msgstr "分享螢幕區域(_S)"
@@ -1061,7 +1057,7 @@ msgstr "顯示進階資訊"
 msgid "Open Avatar Image"
 msgstr "開啟大頭貼圖片"
 
-#: src/avatarmanipulation.cpp:416 src/chatview.cpp:282
+#: src/avatarmanipulation.cpp:416 src/chatview.cpp:283
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -1073,9 +1069,9 @@ msgstr "正在運作……"
 #, c-format
 msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
-"\"Live Free or Die\"\n"
+"\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "\"Live Free or Die\"\n構建於 %.25s"
+msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
@@ -1095,97 +1091,6 @@ msgstr "停止錄製"
 msgid "Send recorded message"
 msgstr "傳送已錄製的訊息"
 
-#: src/ringmainwindow.cpp:192
-msgid "Add account…"
-msgstr "新增帳號……"
-
-#: src/ringmainwindow.cpp:846
-msgctxt "button next to search entry will place a new call"
-msgid "place call"
-msgstr "開始通話"
-
-#: src/ringmainwindow.cpp:849
-msgctxt "button next to search entry will open chat"
-msgid "open chat"
-msgstr "開啟聊天"
-
-#: src/ringmainwindow.cpp:1056
-msgid "Jami - Migration needed"
-msgstr "Jami - 需要遷移"
-
-#: src/ringmainwindow.cpp:1069
-msgid "Migration in progress... please do not close this window."
-msgstr "正在遷移…… 請不要關閉視窗。"
-
-#: src/ringmainwindow.cpp:1350
-msgctxt ""
-"Please try to make the translation 50 chars or less so that it fits into the"
-" layout"
-msgid "Find or start a conversation"
-msgstr "尋找或開始對話"
-
-#: src/ringmainwindow.cpp:1821
-msgid "Leave settings page"
-msgstr "離開設定頁面"
-
-#: src/ringmainwindow.cpp:2248
-msgid "There are active calls"
-msgstr "有活躍的通話"
-
-#: src/ringmainwindow.cpp:2302
-msgid " is calling you!"
-msgstr "正在與您通話!"
-
-#: src/ringmainwindow.cpp:2303
-msgid "Incoming call"
-msgstr "來電"
-
-#: src/ringmainwindow.cpp:2446
-msgid "New request from "
-msgstr "新請求從"
-
-#: src/ringmainwindow.cpp:2447
-msgid "Trust request"
-msgstr "信任請求"
-
-#: src/ringmainwindow.cpp:2508
-msgid "New message"
-msgstr "新訊息"
-
-#: src/ringmainwindow.cpp:2571
-msgid "Stop current call?"
-msgstr "停止目前的通話?"
-
-#: src/ringmainwindow.cpp:2572
-msgid ""
-"A call is currently ongoing. Do you want to close the window and stop all "
-"current calls?"
-msgstr "通話進行中。您想要關閉視窗並停止目前所有的通話嗎?"
-
-#: src/ringmainwindow.cpp:2639
-msgid "Clear history"
-msgstr "清除記錄"
-
-#: src/ringmainwindow.cpp:2640
-msgid "Do you really want to clear the history of this conversation?"
-msgstr "您真的想要清除此對話的歷史嗎?"
-
-#: src/ringmainwindow.cpp:2655
-msgid "Remove conversation"
-msgstr "移除對話"
-
-#: src/ringmainwindow.cpp:2656
-msgid "Do you really want to remove this conversation?"
-msgstr "您真的想要移除此對話嗎?"
-
-#: src/ringmainwindow.cpp:2671
-msgid "Block contact"
-msgstr "阻擋連絡人"
-
-#: src/ringmainwindow.cpp:2672
-msgid "Do you really want to block this contact?"
-msgstr "您真的想要封鎖此聯絡人嗎?"
-
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
 msgid "Jami Error"
@@ -1201,6 +1106,20 @@ msgid ""
 "Jami will now quit."
 msgstr "無法重新連線到 Jami 幕後程式 (dring)。\nJami 將會結束。"
 
+#: src/client_options.c:66
+msgid "Enable debug"
+msgstr "啟用除錯功能"
+
+#: src/client_options.c:68
+msgid ""
+"Restores the hidden state of the main window (only applicable to the primary"
+" instance)"
+msgstr "還原主視窗的隱藏狀態(只適用於主程序)"
+
+#: src/client_options.c:85
+msgid "- GNOME client for Jami"
+msgstr "- Jami 的 GNOME 用戶端"
+
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
 msgstr "撥出視訊通話"
@@ -1245,20 +1164,6 @@ msgstr "設定檔(_P)"
 msgid "(None)"
 msgstr "(無)"
 
-#: src/ring_client_options.c:66
-msgid "Enable debug"
-msgstr "啟用除錯功能"
-
-#: src/ring_client_options.c:68
-msgid ""
-"Restores the hidden state of the main window (only applicable to the primary"
-" instance)"
-msgstr "還原主視窗的隱藏狀態(只適用於主程序)"
-
-#: src/ring_client_options.c:85
-msgid "- GNOME client for Jami"
-msgstr "- Jami 的 GNOME 用戶端"
-
 #: src/accountcreationwizard.cpp:289
 msgid "An error occured during the account creation."
 msgstr "在建立帳號時遇到錯誤。"
@@ -1270,7 +1175,7 @@ msgstr "無法擷取任何帳號,請驗證您的 PIN 碼與您的密碼。"
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "無法擷取任何帳號,請驗證您的封存與您的密碼。"
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
@@ -1285,7 +1190,7 @@ msgstr "密碼不相符"
 msgid "Import from backup"
 msgstr "從備份匯入"
 
-#: src/accountcreationwizard.cpp:754 src/chatview.cpp:277
+#: src/accountcreationwizard.cpp:754 src/chatview.cpp:278
 #: src/newaccountsettingsview.cpp:933
 msgid "Save File"
 msgstr "儲存檔案"
@@ -1306,51 +1211,146 @@ msgstr "帳號已匯出!"
 msgid "Export account failure."
 msgstr "匯出帳號失敗。"
 
-#: src/ringwelcomeview.cpp:92
-msgid ""
-"This is your Jami username.\n"
-"Copy and share it with your friends!"
-msgstr "這是你的 Jami 使用者名稱。\n複製並與你的朋友分享!"
+#: src/mainwindow.cpp:192
+msgid "Add account…"
+msgstr "新增帳號……"
 
-#: src/ringwelcomeview.cpp:100
-msgid ""
-"This is your ID.\n"
-"Copy and share it with your friends!"
-msgstr "這是你的 ID.\n複製並與你的朋友分享!"
+#: src/mainwindow.cpp:846
+msgctxt "button next to search entry will place a new call"
+msgid "place call"
+msgstr "開始通話"
+
+#: src/mainwindow.cpp:849
+msgctxt "button next to search entry will open chat"
+msgid "open chat"
+msgstr "開啟聊天"
+
+#: src/mainwindow.cpp:1056
+msgid "Jami - Migration needed"
+msgstr "Jami - 需要遷移"
+
+#: src/mainwindow.cpp:1069
+msgid "Migration in progress... please do not close this window."
+msgstr "正在遷移…… 請不要關閉視窗。"
+
+#: src/mainwindow.cpp:1350
+msgctxt ""
+"Please try to make the translation 50 chars or less so that it fits into the"
+" layout"
+msgid "Find or start a conversation"
+msgstr "尋找或開始對話"
+
+#: src/mainwindow.cpp:1821
+msgid "Leave settings page"
+msgstr "離開設定頁面"
+
+#: src/mainwindow.cpp:2248
+msgid "There are active calls"
+msgstr "有活躍的通話"
+
+#: src/mainwindow.cpp:2302
+msgid " is calling you!"
+msgstr "正在與您通話!"
+
+#: src/mainwindow.cpp:2303
+msgid "Incoming call"
+msgstr "來電"
+
+#: src/mainwindow.cpp:2446
+msgid "New request from "
+msgstr "新請求從"
+
+#: src/mainwindow.cpp:2447
+msgid "Trust request"
+msgstr "信任請求"
+
+#: src/mainwindow.cpp:2508
+msgid "New message"
+msgstr "新訊息"
+
+#: src/mainwindow.cpp:2571
+msgid "Stop current call?"
+msgstr "停止目前的通話?"
 
-#: src/ringwelcomeview.cpp:195
+#: src/mainwindow.cpp:2572
 msgid ""
-"Jami is free software for universal communication which respects the "
-"freedoms and privacy of its users."
-msgstr "Jami 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。"
+"A call is currently ongoing. Do you want to close the window and stop all "
+"current calls?"
+msgstr "通話進行中。您想要關閉視窗並停止目前所有的通話嗎?"
+
+#: src/mainwindow.cpp:2639
+msgid "Clear history"
+msgstr "清除記錄"
+
+#: src/mainwindow.cpp:2640
+msgid "Do you really want to clear the history of this conversation?"
+msgstr "您真的想要清除此對話的歷史嗎?"
+
+#: src/mainwindow.cpp:2655
+msgid "Remove conversation"
+msgstr "移除對話"
+
+#: src/mainwindow.cpp:2656
+msgid "Do you really want to remove this conversation?"
+msgstr "您真的想要移除此對話嗎?"
 
-#: src/chatview.cpp:277
+#: src/mainwindow.cpp:2671
+msgid "Block contact"
+msgstr "阻擋連絡人"
+
+#: src/mainwindow.cpp:2672
+msgid "Do you really want to block this contact?"
+msgstr "您真的想要封鎖此聯絡人嗎?"
+
+#: src/chatview.cpp:278
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/chatview.cpp:334
+#: src/chatview.cpp:335
 msgid "Retry"
 msgstr "重試"
 
-#: src/chatview.cpp:476
+#: src/chatview.cpp:498
 msgid "Stop"
 msgstr "停止"
 
-#: src/chatview.cpp:994
+#: src/chatview.cpp:1007
 msgid "Send"
 msgstr "傳送"
 
+#: src/client.cpp:115
+#, c-format
+msgid ""
+"Unable to initialize.\n"
+"Make sure the Jami daemon (dring) is running.\n"
+"Error: %s"
+msgstr "無法初始化。\n請確定 Jami 幕後程式 (dring) 正在執行。\n錯誤:%s"
+
+#: src/client.cpp:118
+msgid "Jami Error"
+msgstr "Jami 錯誤"
+
+#: src/client.cpp:395
+msgctxt ""
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr "顯示 Jami"
+
+#: src/client.cpp:399
+msgid "Quit"
+msgstr "結束"
+
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:999
 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:936
+#: src/currentcallview.cpp:935
 msgid "Current conference (all accounts)"
 msgstr "目前的會議(所有帳號)"
 
-#: src/currentcallview.cpp:970
+#: src/currentcallview.cpp:969
 msgid "Current calls (all accounts)"
 msgstr "目前的通話(所有帳號)"
 
@@ -1358,7 +1358,7 @@ msgstr "目前的通話(所有帳號)"
 msgid "Online contacts"
 msgstr "線上聯絡人"
 
-#: src/currentcallview.cpp:1408
+#: src/currentcallview.cpp:1407
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自動"