diff --git a/po/ar.po b/po/ar.po
index d9d06c1455f2b5c59585dcd4c31475c4cee28a58..8ddb9e4042a499cda490df8738397ca4f5ce76e3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Jihed Amine Maaref <jihed-amine.maaref@savoirfairelinux.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/ring/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr ""
 msgid "OK"
 msgstr "موافق"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "النظام"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "إعرض الدردشة على اليمين"
-
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "إعرض الدردشة في الأسفل"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "إعدادات التاريخ"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "أبقي على التاريخ ل (أيام):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "تاريخ"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(ضع صفر لتاريخ غير محدود)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "أزل كل التاريخ"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 410c7bd18019cc4a261ea7082f490c8d250d59bd..64d0f9428616fc26b9da35e11f906cd8049b4e4a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Любомир Василев\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/ring/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr ""
 msgid "OK"
 msgstr "Добре"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Система"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Включване на известията за входящи повиквания."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Включване на известията за нови съобщения."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Показване на съобщенията отдясно."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Показване на съобщенията отдолу."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Настройки на историята"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Пазене на историята (в дни):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "История"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(0 означава безкрайна история)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Изчистване на цялата история"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Това действие е разрушително! Сигурни ли сте, че искате да изтриете цялата история на съобщенията и обажданията?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 161d24bb3b14188a682509e2aed7f9eea1052142..a07e703144f0d423a504b2dd7d20708f7a255c02 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Carles Mateu <carlesm@carlesm.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/ring/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -265,67 +265,63 @@ msgstr "Error creant/carregant compte"
 msgid "OK"
 msgstr "D'acord"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Activa notificacions per trucades entrants."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Activa notificacions per missatges de xat nous"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Mostra imatges i vídeos a la finestra de xat"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostra el cat a la dreta."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostra el xat a la part inferior."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Preferències d'historial"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Guarda l'historial durant (dies):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historial"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(posar a 0 per a historial il·limitat)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Neteja l'historial"
 
@@ -803,23 +799,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Açò és una operació destructiva. Esteu segur que voleu esborrar tot l'historial de xats i trucades?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index cfb52c8ba71d79711cfc5e47eae8410134096d68..85db6acc9ea81a3ec399c84879507adaa3ce6e2c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Stepan Salenikovich\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/ring/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,67 +264,63 @@ msgstr "Chyba při vytváření/nahrávání účtu."
 msgid "OK"
 msgstr "Budiž"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Systém"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Povolit upozornění na příchozí hovory."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Povolit upozornění na příchozí zprávy."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Zadání čísla do pole vyhledávání jej vytočí."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Ukázat zprávy napravo."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Ukázat zprávy dole."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Nastavení historie"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Kolik dnů uchovat historii:"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historie"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(nastavte na 0 pro neomezenou historii)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Vymazat celou historii"
 
@@ -802,23 +798,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Toto je destruktivní akce. Skutečně chcete odstranit veškerou svou historii zpráv a volání?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index ef92a75c33fb4fe524f07f4e944b23813c0bb9ed..ac8effcf26356be9f4a2d4d84453aab163a21537 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\n"
 "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/ring/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,67 +264,63 @@ msgstr "Fejl ved oprettelse/hentning af konto."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Aktiver notifikationer for indgående opkald"
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Aktiver notifikationer for afventende anmodninger."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Aktiver notifikationer for nye beskeder."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Vis billeder og videoer i chat-vindue."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Indtastning af et nummer i søge-feltet vil foretage et opkald."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Downloadmappe:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Vis chat på højre side."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Vis chat i bunden."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Historik-indstillinger"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Behold historik i (dage):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historik"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(brug 0 for uendelig historik)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Slet al historik"
 
@@ -802,23 +798,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr "Igangværende registrering…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dette er en destruktiv handling. Er du sikker på, at du vil slette al historik for beskeder og opkald?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Vælg downloadmappe"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Gem"
diff --git a/po/de.po b/po/de.po
index 3d43c4cd7929b5b5fa9cda2059af7f6b4ebe3cb9..e7a90cc91df21c35b3c014ab4c8eaf8c1628e7c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Stefan Langenmaier <stefan.langenmaier@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/savoirfairelinux/ring/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -275,67 +275,63 @@ msgstr "Problem das Konto zu laden/zu erzeugen."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Benachrichtigungen für eingehende Anrufe aktivieren."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Benachrichtigungen für neue Chatnachrichten aktivieren."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Bilder und Videos im Chat Fenster anzeigen"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Die Eingabe einer Nummer in der Suche startet einen neuen Anruf"
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Chat rechts anzeigen"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Chat unten anzeigen"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Verlaufseinstellungen"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Verlauf behalten für (Tage)"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Verlauf"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(auf 0 setzen für unbegrenzten Verlauf)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Kompletten Verlauf leer"
 
@@ -813,23 +809,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Das ist eine destruktive Operation. Sind Sie sicher, dass Sie die ganze Chat- und Rufgeschichte löschen wollen?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 94595d68055f05bd8415871330ae24e9455146cd..ef32186bf8e38bb8ad20bd76738d19a8f29a09c4 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Blanca Iris Almagro\n"
 "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/ring/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,67 +264,63 @@ msgstr ""
 msgid "OK"
 msgstr "Okay"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
-
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Verlauf"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Gesamten Verlauf löschen"
 
@@ -802,23 +798,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index faa1fadf5b177ccb0d9429174e49cd6203128deb..eafa07fe38ea7023debdf74201910ace1bed83f2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: kostas livs <kostas.livs@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/ring/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "Σφάλμα δημιουργίας/φόρτωσης λογαριασμ
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Σύστημα"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Ενεργοποίηση ειδοποιήσεων για εισερχόμενες κλήσεις."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Ενεργοποίηση ειδοποιήσεων για νέα μηνύματα συνομιλιών."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Η εισαγωγή αριθμού στην γραμμή αναζήτησης θα ξεκινήσει νέα κλήση."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Εμφάνιση συνομιλίας στα δεξιά."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Εμφάνιση συνομιλίας κάτω."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Ρυθμίσεις ιστορικού"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Διατήρηση ιστορικού για (ημέρες):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Ιστορικό"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(ορίστε σε 0 για ιστορικό χωρίς όριο)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Καθαρισμός όλου του ιστορικού"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Αυτή είναι μια καταστροφική λειτουργία. Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις συζήτησης σας και το ιστορικό κλήσεων;"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "Άκυρο"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 2a284feaf9f97de5304a0dc0bf4cb567e2d7354c..daeb30656bead754bd044e83712489e8ff054b1c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Maxime Thiébaut <thi.maxime@gmail.com>\n"
 "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/ring/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "Eraro kreante/ŝarĝante konton."
 msgid "OK"
 msgstr "Okej"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistemo"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Ŝalti sciigojn por envenaj vokoj."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Ŝalti sciigojn por novaj babilmesaĝoj."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Enigi numeron en la serĉejon vokos la numeron."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Montru babilon dekstre."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Montru babilon sube."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Historiaj agordoj"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Konservi historian dum (tagoj):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historio"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(Agordu 0 por senlima historio)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Vakigi tutan historion"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Tiu ĉi ago estas detrua. Ĉu vi certe volas forigi ĉiom da via babila kaj voka historio?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Rezigni"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 53bba3ed0228e5de10099679db445dedfcb255d5..dfd1d3d14138805aeef2065329e406699aeee230 100644
--- a/po/es.po
+++ b/po/es.po
@@ -36,8 +36,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-18 14:35+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Pier Jose Gotta Perez <piegope@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/ring/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -289,67 +289,63 @@ msgstr "Error creando o cargando la cuenta."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Configuraciones de Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Ejecutar Jami al iniciar la sesión"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Mostrar el icono de Jami en el área de notificación (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Mostrar Jami al recibir llamadas"
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Habilitar notificación de llamada entrante."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Habilite las notificaciones sobre peticiones pendientes."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Notificaciones"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Habilitar notificación de mensajes de chat"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Habilitar notificaciones para llamadas entrantes."
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Mostrar imágenes y videos en la ventana de conversación"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Teclear un número en el cuadro de búsqueda hará una llamada."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Carpeta de descargas:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostrar chat a la derecha"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostrar chat abajo"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Configuración del Historial"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Guardar historial por (días):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historial"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(0 para historial ilimitado)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Limpiar todo el historial"
 
@@ -827,23 +823,23 @@ msgstr "Ingrese la contraseña de su cuenta Jami"
 msgid "Registration in progress…"
 msgstr "Registro en curso..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Esta es una operación irreversible. ¿Estás seguro de eliminar todo el historial de chat y llamadas?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Elegir la carpeta de descargas"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Guardar"
diff --git a/po/es_AR.po b/po/es_AR.po
index e46384ba852fc6315867909960bc812e3bdff5d6..4754660a944e2239eec4ee5974091ee701d618b8 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Juan Pablo Castillo <juampicastillovergelin@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/ring/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,67 +261,63 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Ajustes de Historial"
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historial"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 768613391befc932a4b6a4ea9dbf5715d9f7fd40..b0c1e787ee88185e35ea23912d4c8c16cb3abddc 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/ring/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -261,67 +261,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:486
+msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr ""
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 6d28bb1810ca888468bd52a0cc89bbf58c00473b..18bfb2a459bac88a2f2bc8d9f16d7f10831623a5 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Mohammad Amin Sameti <mamins1376@gmail.com>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/ring/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -266,67 +266,63 @@ msgstr "خطا در ایجاد/بارگذاری حساب کاربری."
 msgid "OK"
 msgstr "خب"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "سیستم"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "فعال سازی نوتیفیکیشن ها برای تماس های دریافتی"
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "فعال سازی نوتیفیکیشن ها برای پیام های چت جدید"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "نمایش تصاویر و ویدیو ها در پنجره چت"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "پوشه دانلود:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "نمایش چت در سمت راست."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "نمایش چت در پایین."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "تنظیمات تاریخچه"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "نگه داشتن تاریخچه برای (روز):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "تاریخچه"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "پاکسازی تمام تاریخچه"
 
@@ -804,23 +800,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr "در حال انجام ثبت نام..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "این یک عملیات مخرب است. آیا مطمئن هستید که می‌خواهید تمام گفت‌وگو‌ها و تاریخ‌چه تماس‌تان را پاک کنید؟"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "انتخاب پوشه دانلود"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_ذخیره"
diff --git a/po/fi.po b/po/fi.po
index 6d7e2b84bc92e0f197b7b5bf5f09b5ac3fb254af..cbe74ca772efbd20b14abecb18b5b9e7c903a33a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Kolmis <pekka.hapuli@gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/ring/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Järjestelmä"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Näytä keskustelu oikealla."
-
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Näytä keskustelu alhaalla."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Historian asetukset"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Pidä historia tallessa (päivää):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historia"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(aseta 0 rajoittamattomalle historialle)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Tyhjennä koko historia"
 
@@ -800,23 +796,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 3635e2d70c51f4fb259b2ecad83800441fac37b5..9c01f6ba9de3b2875bc7128eaa59bdf91b247add 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-30 15:41+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\n"
 "Language-Team: French (http://www.transifex.com/savoirfairelinux/ring/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -278,67 +278,63 @@ msgstr "Erreur lors de la création ou du chargement du compte."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Paramètres Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Système"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Lancer Jami à la connexion"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Afficher l’icône de Jami dans la zone de notification"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Afficher Jami en avant plan en cas d'appels entrants"
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Activer les notifications d'appel entrant"
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Activer les notifications pour les invitations"
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Notifications"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Activer les notifications de nouveaux messages"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Activer les notifications sur appels entrants"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Afficher les images et vidéos dans le fenêtre de clavardage."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Pour appeler, entrer le numéro de téléphone dans la zone de recherche."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Dossier de téléchargement :"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Afficher les discussions texte à droite"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Afficher les discussions texte en bas"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Paramètres de l’historique"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "Répertoire de téléchargement"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Garder l’historique pendant (jours) :"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historique"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(mettre à 0 pour garder indéfiniment)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Effacer tout l’historique"
 
@@ -816,23 +812,23 @@ msgstr "Entrer le mot de passe de votre compte Jami"
 msgid "Registration in progress…"
 msgstr "Enregistrement en cours ..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Cette opération est irréversible. Êtes-vous sûr de vouloir effacer toutes vos conversations ainsi que votre historique d'appel ?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Choisissez le dossier de téléchargement"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Sauvegarder"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 7e91672efb39df0a2072591b15eed36b684eabd9..5446bb776e01f6503e5c148eaf89dbc4338b62cb 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Cindy Marchi <cindy.marchi-prat@savoirfairelinux.com>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/ring/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -265,67 +265,63 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Système"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Activer les notifications pour les appels entrants."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Paramètres de l'historique"
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "historique"
+
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Effacer tout l'historique"
 
@@ -803,23 +799,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Êtes-vous certain de vouloir supprimer tout l'historique de votre clavardage et de vos appels?  Cette opération est destructrice."
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
index fe6fd2aff7d82ae373a43167342bb835f9ce45c0..72e23359c1c93bcce6355128f996a8b9be4f263e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/ring/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
@@ -260,67 +260,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr ""
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historique"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -798,23 +794,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 13fe061cff0cfa15c09c0df8d511917422600d3c..af10040ccddc1bc242bc868c97cb747fe52d394f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n"
 "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/ring/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "הגדרות היסטוריה"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "היסטוריה"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "שמור היסטוריה למשך (ימים):"
-
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "טהר היסטוריה"
 
@@ -800,23 +796,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 394626494db8eb510027245759bdd3196a546232..0f1a73af0d08192ff390604d0103963d09c9669e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/ring/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,67 +261,63 @@ msgstr ""
 msgid "OK"
 msgstr "U redu"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sustav"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Postavke povijesti"
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Zadrži povijest (dana):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Povijest"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(postavi na 0 za neograničenu povijest)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Očisti svu povijest"
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 8ba01849c61eceb0178ee9d4678b77eb30972498..5073bca677e2eb8a00dba63610a7de0c9b6c5338 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2019-01-06 01:47+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: . . <ovari123@zoho.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/ring/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -263,67 +263,63 @@ msgstr "Hiba a fiók létrehozása/betöltése során."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "A Jami beállításai"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Rendszer"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "A Jami indítása bejelentkezéskor"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "A Jami ikon megjelenítése az értesítési területen (rendszertálca)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "A Jami előtérbe hozása bejövő hívások esetén."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Értesítések engedélyezése a bejövő hívásokhoz."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "A függőben lévő kérelmekre vonatkozó értesítések engedélyezése."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Értesítések"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Értesítések engedélyezése az új csevegési üzenetekhez."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Értesítések engedélyezése a bejövő hívásokhoz"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Képek és videók megjelenítése a csevegőablakban."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "A keresőmezőbe írt szám új hívást fog indítani."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Letöltés mappa:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Csevegés mutatása a jobb oldalon."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Csevegés mutatása alul."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Előzmények beállításai"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Előzmények megtartása ennyi napig:"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Előzmények"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(állítsa 0-ra a korlátlan előzményekért)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Az összes előzmény törlése"
 
@@ -801,23 +797,23 @@ msgstr "Adja meg a jelszót a Jami fiókjához"
 msgid "Registration in progress…"
 msgstr "Regisztráció folyamatban…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Ez egy destruktív művelet. Biztosan törli az összes csevegést és híváselőzményt?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Letöltési mappa kiválasztása"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Mentés"
diff --git a/po/id.po b/po/id.po
index 8327631b3ba2f8dd1427494797cd34b42942a7d0..24919e7fe6de73656878c9db9eb7899b606a1753 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Rizky Ariestiyansyah <ariestiyansyah.rizky@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/ring/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -260,67 +260,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr ""
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Riwayat"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -798,23 +794,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 27726c5fca44416f2ccae1192a1581197d814d15..eeb650bbb4e3aeb5872c18ab491d8d5719cc1f44 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: michelangelo.marchesi2 <michelangelo.marchesi@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/ring/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostrare la chat a destra."
-
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostrare la chat in basso."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Impostazioni storico"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Tenere lo storico per (giorni):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Cronologia"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(digitare 0 per uno storico senza limiti)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Cancellare tutto lo storico"
 
@@ -800,23 +796,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 743b4ff6b8fa35c1bc81df167c1367aa34d2a2cd..08aed807ad48719d46c23c09cac8c6ca187526fb 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: stefano.fraccaro <stefano.fraccaro@libero.it>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/ring/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,67 +264,63 @@ msgstr "Errore di creazione/caricamento account."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Abilita le notifiche per le chiamate in entrata."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Abilita le notifiche per i nuovi messaggi della chat."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "L'immissione di un numero nel campo di ricerca effettuerà una chiamata"
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostra chat sulla destra."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostra la chat in basso."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Impostazioni Cronologia"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Mantieni la cronologia per (giorni):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Cronologia"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(imposta 0 per cronologia illimitata)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Pulisci la cronologia"
 
@@ -802,23 +798,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Questa è un'operazione distruttiva. Sei sicuro di voler eliminare tutte le tue chat e cronologia chiamate?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 87d9ca527b69e95e843ed6c9457d9665b7ce5488..ce03b3d1fcb8b20001f3bd509d858f87a650e301 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Naofumi <naofum@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/ring/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "システム"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "履歴の設定"
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "履歴"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "履歴をすべて削除"
 
@@ -800,23 +796,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "この操作は取り消すことができません。本当にあなたのすべてのチャットと通話の履歴を削除しますか?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 2eaef39f6c5b863d43c0ad5016446c378ed96a1e..045058aba7b5311e410bc4d76d027e0cb32c49bd 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/ring/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -260,67 +260,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "이력 설정"
-
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -798,23 +794,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 67ecefb75be0560be4654401357c283d93fa0a05..d90d679e3b114082fd7a5ba4ed6ae996c1b240b0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2019-01-06 22:40+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/ring/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -263,67 +263,63 @@ msgstr "Klaida, kuriant/įkeliant paskyrą."
 msgid "OK"
 msgstr "Gerai"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Jami nustatymai"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Paleisti Jami įjungus kompiuterį"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Rodyti Jami piktogramą pranešimų srityje (sistemos dėkle)."
-
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Esant gaunamiesiems skambučiams, rodyti Jami priekiniame plane."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Įjungti pranešimus gaunamiesiems skambučiams."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Įjungti pranešimus naujoms pokalbio žinutėms."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Pranešimai"
+
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Įjungti pranešimus gaunamiesiems skambučiams"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Rodyti pokalbių lange paveikslus ir vaizdo įrašus."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Įvedus numerį į paieškos įrašą, bus pradedama skambinti."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Atsiuntimų aplankas:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Rodyti pokalbį dešinėje."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Rodyti pokalbį apačioje."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Istorijos nustatymai"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Laikyti istoriją (dienų):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Istorija"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(nustatykite 0 neribotai istorijai)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Išvalyti visą istoriją"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr "Vyksta registracija…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Tai yra naikinamasis veiksmas. Ar tikrai norite ištrinti visą savo pokalbių ir skambučių istoriją?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Į_rašyti"
diff --git a/po/ms.po b/po/ms.po
index 227d373953284bbcf2e95adbd59be9a022969d17..14e306684b7947fd75d4352ecf898afeb3f5dfe0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: wig\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/ring/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -260,67 +260,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
-
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr ""
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Sejarah"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -798,23 +794,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 70d302e3d86e7867b65ed361562a32c047a5fb63..b5f2dac2cae45f48777370f1b714706cfa5d4b8a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/ring/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr "Feil ved oppretting/innlasting av konto."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Skru på varsler for innkommende anrop."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Skru på varsler for nye sludremeldinger."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Vis bilder og videoer i sludrevindu."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Inntasting av nummer i søkefeltet vil utføre ny samtale."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Nedlastingsmappe:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Vis sludring til høyre."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Vis sludring nederst."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Historikkinnstillinger"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "Nedlastingsmappe"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Behold historikk i (dager):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historie"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(sett til 0 for ubegrenset historikk)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Nullstill all historikk"
 
@@ -800,23 +796,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dette er en ødeleggende operasjon. Er du sikker på at du vil slette all din sludre- og samtale-historikk?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Velg nedlastingsmappe"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Lagre"
diff --git a/po/nl.po b/po/nl.po
index 56b53f4c9d9742a4149a2ffd1d169c3f690483ba..66307f296aedfc3519b9e46a6a5510a16b3b7a05 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Niels van Duijkeren <nielsvanduijkeren@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/ring/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "Fout bij aanmaken/laden van account."
 msgid "OK"
 msgstr "Oké"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Systeem"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Meldingen inschakelen voor inkomende oproepen."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Meldingen inschakelen voor nieuwe berichten."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Afbeeldingen en video's in chatvenster tonen."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Een nummer in de zoekregel invoeren zal een nieuwe oproep plaatsen."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Downloadmap:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Gesprek rechts weergeven."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Gesprek onderaan weergeven."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Geschiedenisinstellingen"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "Downloadmap"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Geschiedenis bewaren voor (dagen):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Geschiedenis"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(kies 0 voor onbeperkte geschiedenis)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dit is een destructieve bewerking. Weet je zeker dat je je volledige gespreks- en oproepgeschiedenis wil wissen?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Op_slaan"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 4108d37dbd37af6737b6fd7401bb5471c7e3e17c..8bac92169568903125d64cd9b0b58c02c004ed2e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/ring/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "Fout bij aanmaken/laden van account."
 msgid "OK"
 msgstr "Oké"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Systeem"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Meldingen inschakelen voor inkomende oproepen."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Meldingen inschakelen voor nieuwe berichten."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Afbeeldingen en video’s in babbelvenster tonen."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Een nummer in de zoekregel invoeren zal ne nieuwen oproep plaatsen."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Downloadmap:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Gesprek rechts weergeven."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Gesprek onderaan weergeven."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Geschiedenisinstellingen"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Geschiedenis bewaren voor (dagen):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Geschiedenis"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(kiesd 0 voor onbeperkte geschiedenis)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Dit is een destructieve bewerking. Zijde zeker da’ g’uw volledige gespreks- en oproepgeschiedenis wild wissen?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Kiesd downloadmap"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Op_slaan"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 561de1776ca9680afd942a2de6c86be41c14e306..d0e3ff63b3f33973ab5b3d24c87a15a823e729c9 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/ring/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -261,67 +261,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:486
+msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr ""
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 42e835eca33be13095b55e64844cb9cf492920ba..693d89b6e0d68bd794be96f0c13a7ef72dd8d0dd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adam Smith <grzybowawspulnota@cock.li>, 2018-2019
+# Jan Wielkiewicz <grzybowawspulnota@cock.li>, 2018-2019
 # Caspar Cedro <casparcedro96@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2019-01-04 18:57+0000\n"
-"Last-Translator: Adam Smith <grzybowawspulnota@cock.li>\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Caspar Cedro <casparcedro96@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/ring/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -262,67 +262,63 @@ msgstr "Błąd podczas tworzenia/ładowania konta."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Ustawienia Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Uruchamiaj Jami przy starcie"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Pokaż ikonę Jami w pasku powiadomień (systray). "
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Przenieś Jami na pierwszy plan przy połączeniach przychodzących."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Zezwól na powiadomienia dla połączeń przychodzących."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Zezwól powiadomienia dla oczekujących zaproszeń."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Zezwól na powiadomienia dla nowych wiadomości."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Pokaż obrazki i filmy w oknie chatu."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Wpisywanie numeru w pasek wyszukiwania rozpocznie nową rozmowę."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Folder pobrane:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Pokaż czat po prawej stronie."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Pokaż czat na dole."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Ustawienia Historii"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Przechowaj historię do (dni):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historia"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(Ustaw na 0 dla nieograniczonej historii)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Usuń całą historię"
 
@@ -800,23 +796,23 @@ msgstr "Wprowadź hasło swojego konta Jami"
 msgid "Registration in progress…"
 msgstr "Rejestracja w toku..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Czy na pewno chcesz usunąć całą twoją historię chatu? Ta opcja jest nieodwracalna!"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Zapisz"
diff --git a/po/pt.po b/po/pt.po
index ebc371afa5bdeb98afc38105618b6ae4f4d7cbc9..f02eecf2395f9929b782997de06d948a2495e2b6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 23:56+0000\n"
-"Last-Translator: Rui <xymarior@yandex.com>\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Joao Alfredo Gama Batista <joao.gama@savoirfairelinux.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/ring/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "Erro ao criar ou carregar a sua conta."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Configurações Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Iniciar o Jami ao entrar na conta"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Mostrar o ícone Jami na área de notificação (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Trazer o Jami para o primeiro plano ao receber chamadas."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Ativar notificações para chamadas recebidas."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Ativar notificações para pedidos pendentes."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Notificações"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Ativar notificações para novas mensagens de conversação."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Ativar notificações para chamadas recebidas"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Mostrar imagens e vídeos na janela de conversação."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Se introduzir um número no campo de pesquisa irá fazer uma chamada."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Pasta de descarregamentos:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Exibir a conversa à direita."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Exibir a conversa embaixo."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Configurações do Histórico"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Manter histórico por (dias):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(0 indica ilimitado)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
@@ -801,23 +797,23 @@ msgstr "Introduza a palavra-chave da sua conta Jami"
 msgid "Registration in progress…"
 msgstr "A registar..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Isto é uma operação que não poderá desfazer. Tem a certeza que quer eliminar todo o seu histórico de camadas e conversações?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Escolher pasta de descarregamento"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Gravar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 15df43d2600fd2a03e72bd78e78b7f258f99c392..4bebf8af77e1092b8586222783394487d9223e66 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 15:09+0000\n"
-"Last-Translator: Rui <xymarior@yandex.com>\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: gustavo henrique de oliveira correa <gustavo.vfx@hotmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/ring/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -275,67 +275,63 @@ msgstr "Erro ao criar/carregar conta."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Habilitar notificações para chamadas recebidas."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Ativar notificações para solicitações pendentes."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Habilitar notificações para novas mensagens no chat."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Exibir imagens e vídeos na janela do chat."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Entrar um numero na busca iniciará uma nova chamada."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Pasta de downloads:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostre o bate-papo na direita"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostre o bate-papo na parte inferior."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Configurações de histórico"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Manter histórico por (dias):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(configure 0 para histórico ilimitado)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
@@ -813,23 +809,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr "Registro em progresso…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Esta é uma operação destrutiva. Você tem certeza que quer apagar todo o seu histórico de conversas e ligações?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Escolha a pasta de arquivos baixados"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Salvar"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 98812950d167461179b2152ccf7bd263161e24e6..034f030996e552bed9a0db6b8b5cfdb7b1c75c0a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 12:11+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Rui <xymarior@yandex.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/ring/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -261,67 +261,63 @@ msgstr "Erro ao criar/carregar conta."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Configurações do Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Iniciar o Jami ao entrar na conta"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Mostrar ícone do Jami na área de notificação (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Trazer o Jami para o primeiro plano ao receber chamadas."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Ativar notificações para chamadas recebidas."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Ativar notificações para pedidos pendentes."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Notificações"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Ativar notificações para novas mensagens nas conversas.."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Ativar notificações para chamadas recebidas"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Mostrar imagens e vídeos na janela das conversas.."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Introduzir um número na pesquisa iniciará uma nova chamada."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Pasta de descarregamentos:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Mostrar a conversa à direita."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Mostrar a conversa no fundo"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Configurações de Histórico"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Manter histórico por (dias):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(usar 0 para definir histórico ilimitado)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
@@ -799,23 +795,23 @@ msgstr "Introduza a palavra-chave da sua conta Jami"
 msgid "Registration in progress…"
 msgstr "A registar…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Isto é uma operação destrutiva. Tem a certeza que quer eliminar todo o seu histórico de conversas e chamadas?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Gravar"
diff --git a/po/ring-client-gnome.pot b/po/ring-client-gnome.pot
index d5f44249d97d6c87c6fcc89dccace2f3441ef196..4d46d192cbcecea5205b512a451b9e42a51f5941 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-01-07 03:09-0500\n"
+"POT-Creation-Date: 2019-01-14 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"
@@ -259,67 +259,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:486
+msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr ""
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -797,23 +793,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your "
 "chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index ebe4265700d99b3065ad0f3366a4dfd2ccc81d78..74d4058c4734c6f303c6dd7fdd38d563deb47811 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/ring/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -260,67 +260,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
+#: ui/generalsettingsview.ui:486
+msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr ""
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr ""
 
@@ -798,23 +794,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 5704b76e4dd6135492492ce81952b0c4f13542dd..76aa6c30beb36d4c001ca16cfa3f0f090d4024de 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@
 # Viktor Filinkov <bruteforce@sigil.tk>, 2015
 # Vladimir Stoiakin, 2018
 # Yaroslav Molochko <onorua@gmail.com>, 2015
-# AlexanderFilev, 2017
+# Al, 2017
 # Александр Суслов <suslikkreal@gmail.com>, 2015
 # Александр Асланьян <asl174@yandex.ru>, 2015
 # Андрей Шевчук <andrei@shvchk.com>, 2016-2017
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-27 07:25+0000\n"
-"Last-Translator: Vladimir Stoiakin\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Konstantin\n"
 "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/ring/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,67 +277,63 @@ msgstr "Ошибка создания/загрузки аккаунта."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Настройки Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Система"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Запускать Jami при входе в систему"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Показывать значок Jami в области уведомлений (трее)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Выводить Jami на передний план при входящем звонке."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Включить уведомления о входящих звонках."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Включить уведомления о запросах на добавление в контакты."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Уведомления"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Включить уведомления о новых сообщениях чата."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Включить уведомления о входящих звонках."
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Показывать изображения и видео в окне чата."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Осуществлять звонок при вводе номера в области поиска."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Папка для загрузок:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Показать чат справа."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Показать чат снизу."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Настройки истории"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Хранить историю (дней):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "История"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(Поставьте 0 для неограниченного хранения)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Очистить историю"
 
@@ -815,23 +811,23 @@ msgstr "Введите пароль вашей учётной записи Jami"
 msgid "Registration in progress…"
 msgstr "Идёт регистрация…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Это разрушительная операция. Вы уверены, что хотите удалить всю вашу историю чатов и звонков?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Сохранить"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index b86913bdcd87571e8bd2ca1d3707eba2ff8ed912..9cdab153409af95c8a19d77e123056afa14ce7fc 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Pavel Rakleed <rakleed@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/ring/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Система"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Показывать чат справа."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Показывать чат внизу."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Настройки истории"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "История"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(укажите 0 для неограниченного хранения)"
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Очистить историю"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index f0923cb168a41b18df8bb462419d210ad3145d8a..70b965de55f1dbaa9177435a102da0f2aa3fd457 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: it is\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/ring/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,67 +261,63 @@ msgstr ""
 msgid "OK"
 msgstr "Ok"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Nastavenia historie"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "História"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr ""
-
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Vymaž celú historiu"
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 57adbc50a00800235686fac7c85e46539a0efaaa..0684ca584bd6fc341e8d50d5bdf19a62c82c9d81 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Goran Kavrecic <goran.kavrecic@indea.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/ring/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,67 +261,63 @@ msgstr "Napaka pri ustvarjanju/branju računa"
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Omogoči obvestila ob dohodnem klicu"
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Nastavitve zgodovine"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Ohrani zgodovino za (dni)"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Zgodovina"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(Vpiši 0 za neomejeno zgodovino)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Počisti vso zgodovino"
 
@@ -799,23 +795,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/sq_AL.po b/po/sq_AL.po
index ea897f78bbe540e5627214606ee97f438b42528f..33fc9a7da6ecee3688fdd4b86fcdb0aebfdf192a 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-18 08:58+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
@@ -261,67 +261,63 @@ msgstr "Gabim në krijim/ngarkim llogarie."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Rregullime për Jami"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Nise Jami-in kur bëni hyrjen në sistem"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Shfaq ikonë Jami te fusha e njoftimeve (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Sille Jami-n përpara për thirrje ardhëse."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Aktivizo njoftimet për thirrje ardhëse."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Aktivizo njoftime për kërkesa pezull."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Njoftime"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Aktivizo njoftimet për thirrje ardhëse"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Shfaq te dritarja e fjalosjes figura dhe video."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Dhënia e një numri te fusha e kërkimeve do të kryejë një thirrje të re."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Dosje shkarkimesh:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Shfaqe fjalosjen djathtas."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Shfaqe fjalosjen poshtë."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Rregullime Historiku"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "Dosje Shkarkimi"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Mbaje historikun për (ditë):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historik"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(vëreni 0 për historik të pakufizuar)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Pastro krejt historikun"
 
@@ -799,23 +795,23 @@ msgstr "Jepni fjalëkalimin për te llogaria juaj Jami"
 msgid "Registration in progress…"
 msgstr "Regjistrim në kryerje e sipër…"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Ky është veprim me pasoja shkatërruese. Jeni i sigurt se doni të fshihet krejt historiku juaj i fjalosjeve dhe thirrjeve?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Zgjidhni dosje shkarkimesh"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Anuloje"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Ruaje"
diff --git a/po/sv.po b/po/sv.po
index c4f24c4c9a1e2fe1fad3682a73d013eeb699ee46..80e4ba32711779de01ea3cc312ddf7128124d5f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 16:37+0000\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
 "Last-Translator: Åke Engelbrektson\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/ring/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -261,67 +261,63 @@ msgstr "Fel vid skapande/inläsning av konto."
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Jami-inställningar"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "System"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "Starta Jami vid inloggning"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "Visa Jami-ikon i meddelandefältet (systray)."
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "Ta fram Jami till förgrunden vid inkommande samtal."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Aktivera avisering för inkommande samtal."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "Aktivera avisering för väntande förfrågningar."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "Aviseringar"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Aktivera avisering för nya chattmeddelanden."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "Aktivera avisering för inkommande samtal"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "Visa bilder och filmer i chattfönster"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Ange ett nummer i sökfältet för att starta ett nytt samtal."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "Nerladdningsmapp:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Visa chatten till höger"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Visa chatten nederst"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Historikinställningar"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "Nerladdningsmapp"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Spara historiken i (dagar):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Historik"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(Ange 0 för obegränsad historik)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Rensa all historik"
 
@@ -799,23 +795,23 @@ msgstr "Ange lösenordet för ditt Jami-konto"
 msgid "Registration in progress…"
 msgstr "Registrering pågår..."
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Detta är en destruktiv åtgärd. Vill du verkligen ta bort all din chatt- och samtalshistorik?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "Välj nerladdningsmapp"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Spara"
diff --git a/po/tr.po b/po/tr.po
index 9ab2fac7583a7d43abf37d99923ff47d8163be99..ff5127a81c8cd32753c1d2e13ebbd37dc34f902c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Emin Tufan <etcetin@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/ring/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -265,67 +265,63 @@ msgstr "Hesap oluşturma/yükleme hatası."
 msgid "OK"
 msgstr "TAMAM"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Düzen"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "Gelen çağrılar için bildirimleri etkinleştir."
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "Yeni konuşma iletileri için bildirimler etkinleştir."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "Arama girişine bir numara girmek yeni bir arama yapacak."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Konuşmayı sağda göster."
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Konuşmayı aşağıda göster."
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Geçmiş Ayarları"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Geçmişi tutulacak gün sayısı:"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Geçmiş"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(sınırsız geçmiş için 0 yapın)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Tüm geçmişi temizle"
 
@@ -803,23 +799,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Bu yok edici bir eylemdir. Tüm konuşma ve çağrı geçmişini silmek istediğinizden emin misiniz?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 0eb5917046e4dbdda74aea50fed598afbe5e3fa2..a84e237434c040fac57a2b75a99b06580dde7aea 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Денис Голиус <dengolius@yandex.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/ring/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -267,67 +267,63 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "Система"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "Показати повідомлення справа"
-
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "Показати повідомлення внизу"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "Налаштування історії"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "Зберігати історію впродовж (дні)"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "Історія"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(установіть  0 для необмеженої історії)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "Очистити усю історію"
 
@@ -805,23 +801,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index cf8b428a821489f31c4072622105765e096e1ce8..6eaf0ff45443955c0d97bef55161c055349e255f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Derek 呆 <dailidu@linuxdeepin.com>\n"
 "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/ring/language/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
+#: ui/generalsettingsview.ui:43
+msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "在右側顯示聊天"
-
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "在下方顯示聊天"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "歷史記錄設定"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "保留歷史紀錄(天):"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "歷史記錄"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "清除所有歷史紀錄"
 
@@ -801,23 +797,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8cf3c70f21bf04b9f18ef7248670386baabfaa94..7faf1ba1e31b90583c75896e944b2f61bfe4a4e4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 08:09+0000\n"
-"Last-Translator: Alexandre Lision\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Ling-Xiao Yang <ling-xiao.yang@mail.mcgill.ca>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -264,67 +264,63 @@ msgstr "创建或载入帐户时发生错误。"
 msgid "OK"
 msgstr "确定"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr ""
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "系统"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
 msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "启用来电通知。"
-
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "启用新消息通知。"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "在聊天窗口中显示图片和视频"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "要直接拨打电话号码,请在搜索栏中输入该号码。"
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "在右侧显示聊天窗口。"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "在下方显示聊天窗口。"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "历史记录设置"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr ""
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "历史记录保存天数:"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "历史记录"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(设置为0则无限制)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "清除所有历史记录"
 
@@ -802,23 +798,23 @@ msgstr ""
 msgid "Registration in progress…"
 msgstr ""
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1454140564a1e42e56a61045c0bab1107518d82b..aae7c0c1c5f7695eef6c3ca5efff73b56c83f668 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-07 03:09-0500\n"
-"PO-Revision-Date: 2018-12-17 12:16+0000\n"
-"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
+"POT-Creation-Date: 2019-01-14 03:09-0500\n"
+"PO-Revision-Date: 2019-01-14 08:09+0000\n"
+"Last-Translator: Hsiu-Ming Chang <cges30901@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/ring/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -263,67 +263,63 @@ msgstr "建立/載入帳號時發生錯誤。"
 msgid "OK"
 msgstr "確定"
 
-#: ui/generalsettingsview.ui:46
-msgid "Jami Settings"
-msgstr "Jami 設定"
+#: ui/generalsettingsview.ui:43
+msgid "System"
+msgstr "系統"
 
-#: ui/generalsettingsview.ui:62
-msgid "Start Jami on login"
-msgstr "登入時啟動 Jami"
-
-#: ui/generalsettingsview.ui:70
-msgid "Show Jami icon in the notification area (systray)."
-msgstr "在通知區域(系統匣)中顯示 Jami 圖示。"
+#: ui/generalsettingsview.ui:81
+msgid "Start application on login"
+msgstr ""
 
-#: ui/generalsettingsview.ui:78
-msgid "Bring Jami to the foreground on incoming calls."
-msgstr "有來電時將 Jami 帶到前景。"
+#: ui/generalsettingsview.ui:117
+msgid "Show Jami icon (systray) in the systray area"
+msgstr ""
 
-#: ui/generalsettingsview.ui:86
-msgid "Enable notifications for incoming calls."
-msgstr "啟用來電通知。"
+#: ui/generalsettingsview.ui:153
+msgid "Bring Jami to the foreground on incoming calls"
+msgstr ""
 
-#: ui/generalsettingsview.ui:94
-msgid "Enable notifications for pending requests."
-msgstr "啟用擱置中請求的通知。"
+#: ui/generalsettingsview.ui:189
+msgid "Notifications"
+msgstr "通知"
 
-#: ui/generalsettingsview.ui:102
-msgid "Enable notifications for new chat messages."
-msgstr "啟用新聊天訊息通知。"
+#: ui/generalsettingsview.ui:228
+msgid "Enable notifications for incoming calls"
+msgstr "啟用來電通知"
 
-#: ui/generalsettingsview.ui:110
-msgid "Show images and videos in chat window."
-msgstr "在聊天室窗中顯示圖片與影片。"
+#: ui/generalsettingsview.ui:264
+msgid "Enable notifications for pending requests"
+msgstr ""
 
-#: ui/generalsettingsview.ui:118
-msgid "Entering a number in the search entry will place a new call."
-msgstr "在搜尋項目中輸入號碼將會打一通新電話。"
+#: ui/generalsettingsview.ui:300
+msgid "Enable notifications for new chat messages"
+msgstr ""
 
-#: ui/generalsettingsview.ui:131
-msgid "Download folder:"
-msgstr "下載資料夾:"
+#: ui/generalsettingsview.ui:336
+msgid "Chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:158
-msgid "Show chat on the right."
-msgstr "在右邊顯示聊天。"
+#: ui/generalsettingsview.ui:375
+msgid "Display images and videos into the chatview"
+msgstr ""
 
-#: ui/generalsettingsview.ui:164
-msgid "Show chat on the bottom."
-msgstr "在底部顯示聊天。"
+#: ui/generalsettingsview.ui:412
+msgid "Show chatview on the right (on the bottom if off)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:188
-msgid "History Settings"
-msgstr "記錄設定"
+#: ui/generalsettingsview.ui:449
+msgid "Download folder"
+msgstr "下載資料夾"
 
-#: ui/generalsettingsview.ui:206
-msgid "Keep history for (days):"
-msgstr "保持記錄數日"
+#: ui/generalsettingsview.ui:486
+msgid "History"
+msgstr "歷史記錄"
 
-#: ui/generalsettingsview.ui:227
-msgid "(set to 0 for unlimited history)"
-msgstr "(設定0 表示無限制記錄)"
+#: ui/generalsettingsview.ui:525
+msgid "Keep history for (days, 0 = unlimited)"
+msgstr ""
 
-#: ui/generalsettingsview.ui:237
+#: ui/generalsettingsview.ui:555
 msgid "Clear all history"
 msgstr "清除所有記錄"
 
@@ -801,23 +797,23 @@ msgstr "輸入您 Jami 帳號的密碼"
 msgid "Registration in progress…"
 msgstr "正在註冊……"
 
-#: src/generalsettingsview.cpp:102
+#: src/generalsettingsview.cpp:100
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "這是一個破壞性的操作。您確定您想要刪除您所有的聊天與通話紀錄嗎?"
 
-#: src/generalsettingsview.cpp:172
+#: src/generalsettingsview.cpp:170
 msgid "Choose download folder"
 msgstr "選擇下載資料夾"
 
-#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:342
+#: src/generalsettingsview.cpp:173 src/accountgeneraltab.cpp:342
 #: src/avatarmanipulation.cpp:414 src/chatview.cpp:178
 #: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:177 src/accountgeneraltab.cpp:344
+#: src/generalsettingsview.cpp:175 src/accountgeneraltab.cpp:344
 #: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "儲存(_S)"