diff --git a/po/ar.po b/po/ar.po
index a0efc56b752796f347f1b7d74000da273d17cba1..d69c363330805a6cdc68e84fd4c3699d78615653 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Sofian Benissa <sofian_aesa@yahoo.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/jami/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -168,7 +168,7 @@ msgstr "ميديا"
 msgid "Account"
 msgstr "حساب"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "إعدادات"
 
@@ -468,90 +468,102 @@ msgstr "عن RING"
 msgid "_Quit"
 msgstr "غادر"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "النظام"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "تفعيل الإشعارات للمكالمات الواردة"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "تاريخ"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "أزل كل التاريخ"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "تحويل الملفات"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -977,23 +989,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_إلغاء"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1214,90 +1226,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "مسح السجل"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "حظر جهة إتصال"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index e25ccf1043fea6f0a555a8547192f1a4b7fd0cfe..db6453101455bfcb209cdd8a9dbd293a2cf29e7c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-25 06:49+0000\n"
-"Last-Translator: Любомир Василев\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Peter LAlovsky <peter@lalovsky.com>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/jami/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +167,7 @@ msgstr "Звук и видео"
 msgid "Account"
 msgstr "Акаунт"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Настройки"
 
@@ -467,90 +467,102 @@ msgstr "_Относно"
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Система"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Известия"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "История"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Изчистване на цялата история"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Прехвърляне на файлове"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -976,23 +988,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Това действие е разрушително! Сигурни ли сте, че искате да изтриете цялата история на съобщенията и обажданията?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1213,90 +1225,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "започване на разговор"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "отваряне на чата"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Входящо обаждане"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Изчистване на историята"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Премахване на разговора"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Блокиране на контакт"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index a666a011a5d8f35f32af5027e225373b61d3fd31..962c5dda3e53b87f79e92dcf309693f39b7543f3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Benny Beat <bennybeat@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/jami/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -169,7 +169,7 @@ msgstr "Mitjans"
 msgid "Account"
 msgstr "Compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Opcions"
 
@@ -469,90 +469,102 @@ msgstr "_Sobre"
 msgid "_Quit"
 msgstr "_Tanca"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historial"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Neteja l'historial"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferència de fitxers"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -978,23 +990,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1215,90 +1227,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fer una trucada"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "obrir un xat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Trucada entrant"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Neteja historial"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/chatview/tr.po b/po/chatview/tr.po
index 73ca7dec7db034f612b3aa91a620be69434f994c..d5ab6a94c2ff615a0bfed36fb0a36fcfedfb4721 100644
--- a/po/chatview/tr.po
+++ b/po/chatview/tr.po
@@ -7,6 +7,7 @@
 # Emin Tufan <etcetin@gmail.com>, 2019
 # mahmut özcan <mahmutozcan@protonmail.com>, 2019
 # Altay dal <yestajoknu@enayu.com>, 2020
+# Hüseyin Güç <huseyinguc@outlook.com>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -15,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-25 14:38+0200\n"
 "PO-Revision-Date: 2019-05-27 14:08+0000\n"
-"Last-Translator: Altay dal <yestajoknu@enayu.com>, 2020\n"
+"Last-Translator: Hüseyin Güç <huseyinguc@outlook.com>, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/savoirfairelinux/teams/49466/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +70,7 @@ msgstr "Bir ileti yaz"
 
 #: web/chatview.html:301
 msgid "Note: an interaction will create a new contact."
-msgstr ""
+msgstr "No: etkileşim yeni bir kişi oluşturacaktır."
 
 #: web/chatview.html:336
 #, javascript-format
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f748c8b43377d21e7248316a718d657eeca4b99b..98d8b5e12189b83c57e2f2de8cfc5b594e6e2e36 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: fri\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/jami/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -168,7 +168,7 @@ msgstr "Média"
 msgid "Account"
 msgstr "Účet"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -468,90 +468,102 @@ msgstr "_O programu"
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Systém"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Spouštět program po přihlášení"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Ukázat ikonu Jami v oznamovací oblasti panelu"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Při příchozích hovorech přenést okno Jami do popředí."
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Oznámení"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Povolit upozornění na příchozí hovory"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Povolit upozornění na čekající hovory"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Povolit upozornění na nové zprávy během klábosení."
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Okno pro vedení rozhovoru"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Zobrazit v okně pro vedení rozhovoru obrázky a obrazové záznamy"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Ukázat okno pro vedení rozhovor napravo (dole, pokud je vypnuto)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Složka pro stahování"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historie"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Kolik dnů uchovat historii (dny, 0 = neomezeně):"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Vymazat celou historii"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Přenos souboru"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -977,23 +989,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Toto je ničivý zásah. Skutečně chcete odstranit veškerou svou historii zpráv a volání?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Vybrat složku pro stahování"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Uložit"
@@ -1214,90 +1226,90 @@ msgstr "Nepodařilo se vyvést účet."
 msgid "Add account…"
 msgstr "Přidat účet…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "zavolat"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "otevřít zprávy"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Opustit stránku s nastavením"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "vám volá!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nová žádost od"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Žádosti o důvěru"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nová zpráva"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Vymazat historii"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokovat spojení"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index d7752ead7ea56b873d1a2681ff9445c85281ae37..8916f85d71e0e2d7365b3b897001f6fda108f95f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-31 15:13+0000\n"
-"Last-Translator: Stig conrad <stig@conradius.dk>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\n"
 "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/jami/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -169,7 +169,7 @@ msgstr "Medier"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Indstillinger"
 
@@ -469,90 +469,102 @@ msgstr "_Om"
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historik"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Slet al historik"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Filoverførsler"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -978,23 +990,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Vælg downloadmappe"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Gem"
@@ -1215,90 +1227,90 @@ msgstr "Eksport af konto mislykkedes."
 msgid "Add account…"
 msgstr "Tilføj konto…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "foretag opkald"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ã¥bn chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Forlad indstillingsside"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr " kalder dig!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Indgående opkald"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Ny anmodning fra "
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Hav tillid til anmodning"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Ny besked"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Ryd historiken"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloker kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 9a466617ca7921ab38b4befc12d9bcb3ee6ccb00..83f0b103f6bd57c32c3951c77ae57ee082814cdb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,9 +26,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-26 18:26+0000\n"
-"Last-Translator: Bob Q\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: nautilusx\n"
 "Language-Team: German (http://www.transifex.com/savoirfairelinux/jami/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,7 +183,7 @@ msgstr "Medium"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -483,90 +483,102 @@ msgstr "_Ãœber Jami"
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Jami automatisch starten"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Jami-Icon in Informationsleiste (SysTray) zeigen"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Eingehender Anruf automatisch im Vordergrund"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Erlaube Benachrichtigungen für eingehende Anrufe"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Erlaube Benachrichtigungen für wartende Anrufe"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Erlaube Benachrichtigungen für neue Chat-Nachrichten"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Chatansicht"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Tippbenachrichtigungen anzeigen"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Bilder und Videos in Chatansicht anzeigen"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Chatansicht auf der rechten Seite anzeigen (Standard ist am unteren Ende)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Ordner herunterladen"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Verlauf"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Historie aufbewahren für (Tage, 0 = unbegrenzt)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Kompletten Verlauf leer"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Anrufaufzeichnung"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "lokales Video aufzeichnen"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Anrufe immer aufzeichnen"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Aufzeichnungsordner"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitrate für Anrufaufzeichnung (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Dateitransfer"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informationen"
@@ -992,23 +1004,23 @@ msgstr "Name kann nicht registriert werden (Benutzername bereits vergeben)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Name kann nicht registriert werden (Netzwerkfehler) - Internetverbindung prüfen."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Zielordner wählen"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Speichern"
@@ -1229,90 +1241,90 @@ msgstr "Fehler beim Kontoexport."
 msgid "Add account…"
 msgstr "Konto hinzufügen..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Anrufen"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Chat öffnen"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Migration notwendig"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migration im Gange... Bitte nicht dieses Fenster schließen."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Suche oder starte eine Konversation"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Seite mit Einstellungen verlassen"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Es gibt aktive Anrufe"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "ruft Sie gerade an!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Neue Anfrage von"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Anfrage vertrauen"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Aktuellen Anruf beenden?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Ein Aufruf ist derzeit im Gange. Möchten Sie das Fenster schließen und alle aktuellen Anrufe stoppen?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Verlauf leeren"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Wollen Sie wirklich den Verlauf dieser Konversation löschen?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Konversation entfernen"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Wollen Sie wirklich diese Konversation löschen?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Kontakt blockieren"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Wollen Sie wirklich diesen Kontakt sperren?"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index b28a59c10522886d0448b53c6c284020e9cf3dd0..b69e4e83396bf78a4fd7dce61851c1cbff8ca5e9 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-07 01:47+0000\n"
-"Last-Translator: Markus Maurer <admin@ryuum3gum1n.de>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Chris <ch-dev@mailbox.org>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/jami/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,7 +170,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -470,90 +470,102 @@ msgstr "_Ãœber"
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Jami automatisch starten."
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Jami im Infobereich (System-Tray) anzeigen."
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Bei eingehenden Anrufen in den Vordergrund holen"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Benachrichtigungen für eingehende Anrufe aktivieren"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Benachrichtigungen für neue Chatnachrichten aktivieren"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Download-Ordner"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Verlauf"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Gesamten Verlauf löschen"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Dateiübertragung"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -979,23 +991,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Download-Ordner auswählen"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1216,90 +1228,90 @@ msgstr "Konto-Export fehlgeschlagen."
 msgid "Add account…"
 msgstr "Konto hinzufügen…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Einstellungen verlassen"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Verlauf löschen"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Kontakt blockieren"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 724d4a9b147a02c78bf0f3fd0af9a6654a8661a4..7cacd4217113f1be8cf6315f3f6fc7bba02bc611 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/jami/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "Μέσα"
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
@@ -467,90 +467,102 @@ msgstr "Σχετικά"
 msgid "_Quit"
 msgstr "Έξοδος"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Σύστημα"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Ιστορικό"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Καθαρισμός όλου του ιστορικού"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -976,23 +988,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Αυτή είναι μια καταστροφική λειτουργία. Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις συζήτησης σας και το ιστορικό κλήσεων;"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "Άκυρο"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1213,90 +1225,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "έναρξη κλήσης"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "άνοιγμα συνομιλίας"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Εισερχόμενη κλήση"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 9a79ac1acb1fcdfd2fe3879158c4038e0c67d7a6..677da45084cfc2da8cdf876501b63f5402aea53a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,12 +6,13 @@
 # Maxime Thiébaut <thi.maxime@gmail.com>, 2016
 # Stepan Salenikovich <>, 2016
 # Tirifto <tirifto@openmailbox.org>, 2016
+# Warut Bunprasert <warutbun92@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/jami/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -28,32 +29,32 @@ msgstr "Äœeneralaj"
 #: ui/help-overlay.ui:18
 msgctxt "shortcut window"
 msgid "Open application menu"
-msgstr ""
+msgstr "Malfermi apikaĵmenuon"
 
 #: ui/help-overlay.ui:25
 msgctxt "shortcut window"
 msgid "Open account list"
-msgstr ""
+msgstr "Malfermi konto-liston"
 
 #: ui/help-overlay.ui:32
 msgctxt "shortcut window"
 msgid "Select search bar"
-msgstr ""
+msgstr "Elekti serĉujon"
 
 #: ui/help-overlay.ui:39
 msgctxt "shortcut window"
 msgid "Focus the list of conversations"
-msgstr ""
+msgstr "Fokusi la liston de konversacioj"
 
 #: ui/help-overlay.ui:46
 msgctxt "shortcut window"
 msgid "Focus the list pending requests"
-msgstr ""
+msgstr "Fokusi la litson de pritraktotaj petoj"
 
 #: ui/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Toggle fullscreen"
-msgstr ""
+msgstr "Åœalti plenan ekranon"
 
 #: ui/help-overlay.ui:63
 msgctxt "shortcut window"
@@ -63,12 +64,12 @@ msgstr "Konversacioj"
 #: ui/help-overlay.ui:68
 msgctxt "shortcut window"
 msgid "Start a video call"
-msgstr ""
+msgstr "Komenci videan vokon"
 
 #: ui/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Start an audio call"
-msgstr ""
+msgstr "Komenci sonan vokon"
 
 #: ui/help-overlay.ui:82
 msgctxt "shortcut window"
@@ -167,7 +168,7 @@ msgstr "Aŭdvidaĵo"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Agordoj"
 
@@ -264,7 +265,7 @@ msgstr "Kaŝi videon"
 
 #: ui/currentcallview.ui:388
 msgid "Toggle recording"
-msgstr ""
+msgstr "Åœalti registradon"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
 #: ui/messagingwidget.ui:29 src/chatview.cpp:348
@@ -297,11 +298,11 @@ msgstr "Transigo"
 
 #: ui/currentcallview.ui:552
 msgid "Transfer to"
-msgstr ""
+msgstr "Transigi al"
 
 #: ui/currentcallview.ui:616
 msgid "Add"
-msgstr ""
+msgstr "Aldoni"
 
 #: ui/accountcreationwizard.ui:42
 msgid "Welcome to"
@@ -467,90 +468,102 @@ msgstr "_Pri"
 msgid "_Quit"
 msgstr "_Eliri"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistemo"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historio"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Vakigi tutan historion"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -976,23 +989,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Rezigni"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1213,90 +1226,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "voki"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "malfermi babilejon"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Envena voko"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Vakigi historion"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
@@ -1332,11 +1345,11 @@ msgstr ""
 msgctxt ""
 "In the status icon menu, toggle action to show or hide the Jami main window"
 msgid "Show Jami"
-msgstr ""
+msgstr "Montri Jami"
 
 #: src/client.cpp:399
 msgid "Quit"
-msgstr ""
+msgstr "Eliri"
 
 #: src/accountmigrationview.cpp:186 src/newaccountsettingsview.cpp:970
 msgid ""
diff --git a/po/es.po b/po/es.po
index 38499eea22f81a8eafa534360c4ba191f6d1ac48..a01939dcad2c6bdff659b911dae351fbe728d1d8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -40,9 +40,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-24 15:25+0000\n"
-"Last-Translator: Juan Manuel <jumase.25@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: advocatux\n"
 "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/jami/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,7 +197,7 @@ msgstr "Medios"
 msgid "Account"
 msgstr "Cuenta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Configuración"
 
@@ -497,90 +497,102 @@ msgstr "_Acerca de"
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Iniciar aplicación al iniciar sesión"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostrar el ícono de Jami (systray) en el área de programas en ejecución"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Traer a Jami a primer plano en llamadas entrantes"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Habilitar notificaciones para llamadas entrantes."
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Activar notificaciones para solicitudes pendientes"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Activar notificaciones para nuevos mensajes en el chat"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Vista de chat"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Mostrar indicador \"Escribiendo...\""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Mostrar imágenes y vídeos dentro de la vista de chat"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostrar la vista de chat a la derecha (en la parte inferior si esta desactivado)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Descargar carpeta"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historial"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Mantener el historial por (días, 0 = ilimitado)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Limpiar todo el historial"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Grabador de llamadas"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Grabar video local"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Siempre grabar llamadas"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Carpeta de grabaciones"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Tasa de bits de las grabaciones de llamadas (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferencia de archivos"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Información"
@@ -1006,23 +1018,23 @@ msgstr "Imposible registrar nombre (nombre de usuario ya existente)"
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Imposible registrar nombre (error de red) - Compruebe su conexión"
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Elegir la carpeta de descargas"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Guardar"
@@ -1243,90 +1255,90 @@ msgstr "Fallo al exportar la cuenta."
 msgid "Add account…"
 msgstr "Añadir cuenta..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "llamar"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Abrir chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - se requiere migración"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migración en proceso... por favor, no cierres esta ventana."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Busca o comienza una conversación"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Abandonar la página de configuración"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Hay llamadas activas"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "te está llamando."
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nueva petición de"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Solicitud de confianza"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nuevo mensaje"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "¿Finalizar llamada actual?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Una llamada está activa. ¿Quiere cerrar la ventana y finalizar todas las llamadas que se están llevando a cabo?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Limpiar historial"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "¿Desea eliminar el historial de esta conversación?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Eliminar conversación"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "¿Desea eliminar esta conversación?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contacto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "¿Desea bloquear este contacto?"
 
diff --git a/po/es_AR.po b/po/es_AR.po
index 1074ee5f808bcaf2bae66a983801986741352a3a..f6f56b4d39c4e6f65c3ce9db6113d90184448e0c 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Juan Pablo Castillo <juampicastillovergelin@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/jami/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr "Medios"
 msgid "Account"
 msgstr "Cuenta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historial"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferencia de archivos"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Borrar historial"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contacto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/et.po b/po/et.po
index eea4aed5bace5b2f3a94a2e9f4a9cee2e38d9e89..bbdf2f9d8f2c7d652f73d9231d70366c3d322da3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-07 19:17+0000\n"
-"Last-Translator: Priit Jõerüüt <transifex@joeruut.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/savoirfairelinux/jami/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Kustuta ajalugu"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Kustuta vestlus"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokeeri kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/eu.po b/po/eu.po
index 14a1c663e2b8134af96ae6fc4a63685dcd8674c3..dff4d1028a2708a34689ea6f4f8588e2724aa678 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # i4sal <i4sala@protonmail.com>, 2018
+# Leticia E <letolagain@gmail.com>, 2020
 # Osoitz <oelkoro@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-26 19:29+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: Osoitz <oelkoro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/jami/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -27,17 +28,17 @@ msgstr "Orokorra"
 #: ui/help-overlay.ui:18
 msgctxt "shortcut window"
 msgid "Open application menu"
-msgstr ""
+msgstr "Ireki aplikazio menua"
 
 #: ui/help-overlay.ui:25
 msgctxt "shortcut window"
 msgid "Open account list"
-msgstr ""
+msgstr "Ireki kontu-zerrenda"
 
 #: ui/help-overlay.ui:32
 msgctxt "shortcut window"
 msgid "Select search bar"
-msgstr ""
+msgstr "Bilaketa-barra hautatu"
 
 #: ui/help-overlay.ui:39
 msgctxt "shortcut window"
@@ -77,12 +78,12 @@ msgstr "Garbitu historiala"
 #: ui/help-overlay.ui:89
 msgctxt "shortcut window"
 msgid "Add conversation"
-msgstr ""
+msgstr "Elkarrizketa gehitu"
 
 #: ui/help-overlay.ui:96
 msgctxt "shortcut window"
 msgid "Remove conversation"
-msgstr ""
+msgstr "Elkarrizketa ezabatu"
 
 #: ui/help-overlay.ui:103
 msgctxt "shortcut window"
@@ -107,12 +108,12 @@ msgstr ""
 #: ui/help-overlay.ui:132
 msgctxt "shortcut window"
 msgid "Accept call"
-msgstr ""
+msgstr "Deia onartu"
 
 #: ui/help-overlay.ui:139
 msgctxt "shortcut window"
 msgid "Decline call"
-msgstr ""
+msgstr "Deia ukatu"
 
 #: ui/help-overlay.ui:148
 msgctxt "shortcut window"
@@ -127,7 +128,7 @@ msgstr ""
 #: ui/help-overlay.ui:160
 msgctxt "shortcut window"
 msgid "Open general settings"
-msgstr ""
+msgstr "Ireki ezarpen orokorrak"
 
 #: ui/help-overlay.ui:167
 msgctxt "shortcut window"
@@ -147,7 +148,7 @@ msgstr ""
 #: ui/help-overlay.ui:189
 msgctxt "shortcut window"
 msgid "Write on a new line"
-msgstr ""
+msgstr "Idatzi lerro berri batean"
 
 #: ui/mainwindow.ui:57
 msgid "Menu"
@@ -166,7 +167,7 @@ msgstr "Multimedia"
 msgid "Account"
 msgstr "Kontua"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ezarpenak"
 
@@ -204,13 +205,13 @@ msgstr "Pasahitza"
 
 #: ui/accountmigrationview.ui:205 ui/accountcreationwizard.ui:1057
 msgid "Account manager"
-msgstr ""
+msgstr "Kontu kudeatzaile"
 
 #: ui/accountmigrationview.ui:236 ui/newaccountsettingsview.ui:554
 #: ui/newaccountsettingsview.ui:847 src/accountmigrationview.cpp:187
 #: src/newaccountsettingsview.cpp:971 src/newaccountsettingsview.cpp:2102
 msgid "Delete account"
-msgstr ""
+msgstr "Kontua ezabatu"
 
 #: ui/accountmigrationview.ui:251
 msgid "Migrate account"
@@ -234,7 +235,7 @@ msgstr "Amaitu deia"
 
 #: ui/currentcallview.ui:275 ui/currentcallview.ui:493
 msgid "Add participant"
-msgstr ""
+msgstr "Partaide gehitu"
 
 #: ui/currentcallview.ui:294
 msgid "Toggle transfer"
@@ -300,7 +301,7 @@ msgstr ""
 
 #: ui/currentcallview.ui:616
 msgid "Add"
-msgstr ""
+msgstr "Gehitu"
 
 #: ui/accountcreationwizard.ui:42
 msgid "Welcome to"
@@ -308,7 +309,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:76
 msgid "Create local account"
-msgstr ""
+msgstr "Sortu kontu lokala"
 
 #: ui/accountcreationwizard.ui:77
 msgid "Create a new Jami account on this device (for new users)"
@@ -404,7 +405,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:664 src/newaccountsettingsview.cpp:854
 msgid "Confirm password"
-msgstr ""
+msgstr "Berretsi pasahitza"
 
 #: ui/accountcreationwizard.ui:735
 msgid "Generating your Jami account…"
@@ -466,90 +467,102 @@ msgstr ""
 msgid "_Quit"
 msgstr "_Kendu"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historiala"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Garbitu historial osoa"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Fitxategi-transferentzia"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -975,23 +988,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Gorde"
@@ -1212,90 +1225,90 @@ msgstr ""
 msgid "Add account…"
 msgstr "Gehitu kontua..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Sarrera-deia"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Garbitu historiala"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
-msgstr ""
+msgstr "Elkarrizketa ezabatu"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokeatu kontaktua"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 84d68db49bb1e33369224622a687d7dd7e704064..4dd22387d1e3f873604bd2bf4262ff5afdb326f8 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-14 13:21+0000\n"
-"Last-Translator: Hamid reza Zaefarani\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Reza Ghasemi\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/jami/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,7 +173,7 @@ msgstr "رسانه"
 msgid "Account"
 msgstr "حساب کاربری"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "تنظیمات"
 
@@ -473,90 +473,102 @@ msgstr "_درباره"
 msgid "_Quit"
 msgstr "_خروج"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "سیستم"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "راه‌اندازی برنامه در هنگام ورود به سیستم"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "نمایش نماد جمی (مربوط به سینی سیستم) در قسمت سینی سیستم"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "انتقال جمی به پیش‌زمینه در تماس‌های دریافتی "
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "آگاهی‌ها"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "فعال‌سازی اعلان‌ها را برای تماس‌های دریافتی"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "فعال‌سازی اعلان‌ها برای تماس‌های در انتظار"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "فعال‌سازی اعلان‌ها را برای پیام‌های گفتگوی جدید"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "نمای گفتگو"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "نمایش نشان‌های نوشتاری"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "نمایش تصاویر و ویدیو‌ها در نمای گفتگو"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "نمایش نمای گفتگو در سمت راست (در پایین در صورت عدم انتخاب)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "شاخهٔ بارگیری"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "تاریخچه"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "نگه داشتن سابقه برای (روز، 0 = نامحدود)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "پاکسازی تمام تاریخچه"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "ضبط تماس"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "ضبط ویدیوی محلی"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "همیشه تماس ها را ضبط کن"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "پوشه ضبط"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "نرخ بیت برای ضبط تماس‌ها (کیلوبیت بر ثانیه)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "انتقال فایل"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "اطلاعات"
@@ -982,23 +994,23 @@ msgstr "عدم توانایی در ثبت نام (نام کاربری قبلا 
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "عدم توانایی در ثبت نام (خطا شبکه) - اتصال خود را بررسی کنید."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "این یک عملیات مخرب است. آیا مطمئن هستید که می‌خواهید تمام گفت‌وگو‌ها و تاریخ‌چه تماس‌تان را پاک کنید؟"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "انتخاب پوشه دانلود"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_لغو"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_ذخیره"
@@ -1219,90 +1231,90 @@ msgstr "برون‌برد حساب کاربری ناموفق بود."
 msgid "Add account…"
 msgstr "افزودن حساب..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "تماس تلفنی"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "گشودن گپ"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - نیازمند کوچاندن"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "کوچاندن در جریان... لطفا این پنجره را نبندید."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "پیدا کردن یا شروع یک گفتگو"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "خروج از صفحهٔ تنظیمات"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "تماس های فعال وجود دارند"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "در حال تماس گرفتن با شماست!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "تماس ورودی"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "درخواست جدید از جانب"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "درخواست اعتماد"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "پیام جدید"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "قطع تماس فعلی؟"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "یک تماس در جریان است. آیا میخواهید این پنجره را ببندید و تمام تماس های فعلی را متوقف کنید؟"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "پاک‌سازی تاریخچه"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "آیا واقعا می‌خواهید تا تاریخچه این گفتگو را پاک کنید؟"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "حذف گفتگو"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "آیا به حذف این گفتگو مطمئن هستید؟"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "مسدودسازی مخاطب"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "آیا از مسدود سازی این مخاطب مطمئن هستید؟"
 
diff --git a/po/fi.po b/po/fi.po
index dc6881cb4467fededcf9072f993265c1da077a83..e1e78e654b8215c452b9b51a240b46e177a27eb1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-17 18:11+0000\n"
-"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Squid Developer <tehpyta@protonmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/jami/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -168,7 +168,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Tunnus"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -468,90 +468,102 @@ msgstr "_Tietoja"
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Käynnistä sovellus kirjautumisen yhteydessä"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Näytä Jami-kuvake paneelissa (alavalikossa)"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Tuo Jami etualalle saapuvissa puheluissa"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Ilmoitukset"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Ota ilmoitukset käyttöön saapuville puheluille"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Ota ilmoitukset käyttöön odottaviin pyyntöihin"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Ota ilmoitukset käyttöön uusista chat-viesteistä"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Chat-näkymä"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Kirjoittamisen merkki näkyviin"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Näytä kuvat ja videot chat-näkymään"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Näytä chat-näkymä oikealla (alhaalla jos pois päältä)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Ladatut kansio"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historia"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Säilytä historia (päivää, 0 = rajoittamaton)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Tyhjennä koko historia"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Puhelun tallennus"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Tallenna paikallinen video"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Tallenna puhelut aina"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Tallenna kansioon"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Puhelujen tallenuksen bittinopeus (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Tiedostonsiirto"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Tietoa"
@@ -977,23 +989,23 @@ msgstr "Nimeä ei voi rekisteröidä (käyttäjänimi varattu)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Nimeä ei voi rekisteröidä (verkkovirhe) - tarkista yhteys."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Tämä poistaa kaiken. Haluatko varmasti poistaa kaikki keskustelu- ja puheluhistoriasi?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Valitse latauskansio"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Peruuta"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Tallenna"
@@ -1214,90 +1226,90 @@ msgstr "Tilin vienti epäonnistui"
 msgid "Add account…"
 msgstr "Lisää tunnus…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "aloita puhelu"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "avaa chatti"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - päivitys tarvitaan"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Päivitys käynnissä... älä sulje tätä ikkunaa."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Etsi tai aloita keskustelu"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Poistu asetussivulta"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Täällä on aktiivisia puheluja"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "soittaa sinulle!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Uusi pyyntö käyttäjältä"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Luottamuspyyntö"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Uusi viesti"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Lopeta nykyinen puhelu?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Puhelu on parhaillaan käynnissä. Haluatko sulkea ikkunan ja lopettaa kaikki nykyiset puhelut?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Tyhjennä historia"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Haluatko todella tyhjentää tämän keskustelun historian?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Poista keskustelu"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Haluatko todella poistaa tämän keskustelun?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Estä yhteystieto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Haluatko todella estää tämän kontaktin?"
 
diff --git a/po/fr.po b/po/fr.po
index 081caa669304772468664b87edadae8274de8fb3..66fc2c508b05b779cc325b5662588fb640881407 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-01 15:17+0000\n"
-"Last-Translator: Melissa Riou <melissa.riou@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>\n"
 "Language-Team: French (http://www.transifex.com/savoirfairelinux/jami/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -184,7 +184,7 @@ msgstr "Médias"
 msgid "Account"
 msgstr "Compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -484,90 +484,102 @@ msgstr "À _propos"
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Système"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Lancer Jami à l’ouverture de session"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Montrer l'icône de Jami dans la zone de notification"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Ramener Jami à l’avant-plan en cas d’appel entrant"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Activer les notifications sur appels entrants"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Activer les notifications pour les invitations en attente"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Activer les notifications de nouveaux messages"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Vue dicussions"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Montrer l'indicateur d'écriture"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Afficher les images et les vidéos dans la vue des discussions"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Afficher les discussions texte à droite (par défaut en bas)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Répertoire de téléchargement"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historique"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Garder l’historique pendant (jours, 0 = illimité)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Effacer tout l’historique"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Enregistrement d'appel"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Enregistrer la vidéo locale"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Toujours enregistrer les appels"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Répertoire des fichiers d'enregistrements"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Débit pour l'enregistrement d'appel (kb/s) "
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transfert de fichier"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informations"
@@ -993,23 +1005,23 @@ msgstr "Impossible d'enregistrer le nom: le nom est déjà utilisé."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Impossible d'enregistrer le nom : une erreur s'est produite sur le réseau. Vérifiez votre connectivité."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Choisissez le dossier de téléchargement"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Sauvegarder"
@@ -1230,90 +1242,90 @@ msgstr "Échec de l'export de compte."
 msgid "Add account…"
 msgstr "Ajouter un compte ..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir la discussion"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Migration nécessaire"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migration en cours ... S'il vous plaît, ne fermez pas la fenêtre."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Chercher ou démarrer une conversation"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Quitter la page des réglages"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Il y a des appels en cours"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "vous appelle"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nouvelle demande de "
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Invitation"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nouveau message"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Mettre fin à l'appel en cours?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "I y a un appel en cours. Désirez vous fermer la fenêtre et mettre fin à tous les appels en cours?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Effacer l'historique"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Voulez-vous vraiment effacer l'historique de cette conversation ?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Supprimer la conversation"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Êtes-vous certain de vouloir supprimer cette conversation ? "
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquer le contact"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Souhaitez-vous vraiment bloquer ce contact ?"
 
diff --git a/po/fr_BE.po b/po/fr_BE.po
index 13d216277b3b1250dd5bc71ead47a94d193518f7..4755cdb16ab3e64b1e78b5c54bc2f9368ecb1156 100644
--- a/po/fr_BE.po
+++ b/po/fr_BE.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-02 01:41+0000\n"
-"Last-Translator: Kateryna K <katerynakostiukGer@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/fr_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Account"
 msgstr "Compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historique"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquer le contact"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/fr_CA.po b/po/fr_CA.po
index b72423edc9014042c05e3aafe3f0a173bd8de13b..6ac6c29bb12bec5c2f6b42df21650d9b343cf4b7 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-02 01:42+0000\n"
-"Last-Translator: Kateryna K <katerynakostiukGer@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -169,7 +169,7 @@ msgstr "Média"
 msgid "Account"
 msgstr "Compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Réglages"
 
@@ -469,90 +469,102 @@ msgstr "_A propos"
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Système"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "historique"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Effacer tout l'historique"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -978,23 +990,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1215,90 +1227,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir le clavardage"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Effacer l'historique"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquer le contact"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/fr_CH.po b/po/fr_CH.po
index 2b3d17e663177f2a8b7bffffedc033bc0496f109..e89156aaae07f89d23bedc52be2a317841742c0d 100644
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-02 01:42+0000\n"
-"Last-Translator: Kateryna K <katerynakostiukGer@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (Switzerland) (http://www.transifex.com/savoirfairelinux/jami/language/fr_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Account"
 msgstr "Compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historique"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquer le contact"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index ef9761f0207c0031d518131a30ea411535c588f3..71f96675b544ff776028c601d11b3595d60774a2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-02 01:42+0000\n"
-"Last-Translator: Kateryna K <katerynakostiukGer@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/jami/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Account"
 msgstr "compte"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Système"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historique"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Vider l'historique"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquer le contact"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index 77cfc94488e9197e78fd4f6cb3c7bd1741b09e9d..fa5f95d9e88db1dbb6697ff5274ed578a8908308 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-26 23:20+0000\n"
-"Last-Translator: monfero <monfero@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Xosé M. <correo@xmgz.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/savoirfairelinux/jami/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr "Multimedia"
 msgid "Account"
 msgstr "Conta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Axuste"
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notificacións"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Activar notificacións para chamadas entrantes"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Vista de chat"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Mostrar suxestións de escritura"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Mostrar imaxes e vídeos na vista de chat"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Cartafol para descargas"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historial"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Manter o historial durante (días, 0 = sen límite)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Eliminar historial"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Gravación de chamada"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Gravar vídeo local"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Gravar sempre as chamadas"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Cartafol de gravacións"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferencia de ficheiro"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informacións"
@@ -567,11 +579,11 @@ msgstr "Axustes de audio"
 
 #: ui/mediasettingsview.ui:40
 msgid "Audio manager:"
-msgstr ""
+msgstr "Xestor de audio:"
 
 #: ui/mediasettingsview.ui:52
 msgid "Ringtone device:"
-msgstr ""
+msgstr "Dispositivo de ton de chamada:"
 
 #: ui/mediasettingsview.ui:64
 msgid "Output device:"
@@ -583,7 +595,7 @@ msgstr "Dispositivo de entrada:"
 
 #: ui/mediasettingsview.ui:88
 msgid "Input volume meter:"
-msgstr ""
+msgstr "Control de volume de entrada:"
 
 #: ui/mediasettingsview.ui:156
 msgid "Camera Settings"
@@ -630,7 +642,7 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
-msgstr ""
+msgstr "Contrasinal (obrigatorio):"
 
 #: ui/newaccountsettingsview.ui:166
 msgid "Enter archive password"
@@ -646,19 +658,19 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:231
 msgid "Your generated pin:"
-msgstr ""
+msgstr "O seu pin xerado:"
 
 #: ui/newaccountsettingsview.ui:511
 msgid "Click to change password"
-msgstr ""
+msgstr "Premer para mudar o contrasinal"
 
 #: ui/newaccountsettingsview.ui:591 ui/newaccountsettingsview.ui:874
 msgid "Enable account"
-msgstr ""
+msgstr "Activar conta"
 
 #: ui/newaccountsettingsview.ui:670
 msgid "SIP server"
-msgstr ""
+msgstr "Servidor SIP"
 
 #: ui/newaccountsettingsview.ui:752
 msgid "password"
@@ -682,7 +694,7 @@ msgstr "Ligar outro dispositivo"
 
 #: ui/newaccountsettingsview.ui:998
 msgid "Banned contacts"
-msgstr ""
+msgstr "Contactos excluídos"
 
 #: ui/newaccountsettingsview.ui:1054
 msgid "Advanced settings"
@@ -690,7 +702,7 @@ msgstr "Axustes avanzados"
 
 #: ui/newaccountsettingsview.ui:1090
 msgid "General settings"
-msgstr ""
+msgstr "Axustes xerais"
 
 #: ui/newaccountsettingsview.ui:1108
 msgid "Call settings"
@@ -722,7 +734,7 @@ msgstr "Configuración OpenDHT"
 
 #: ui/newaccountsettingsview.ui:1416
 msgid "Auto connect on local network"
-msgstr ""
+msgstr "Autoconectar en rede local"
 
 #: ui/newaccountsettingsview.ui:1452
 msgid "Bootstrap"
@@ -730,7 +742,7 @@ msgstr "Bootstrap"
 
 #: ui/newaccountsettingsview.ui:1512
 msgid "Encrypt media streams (SRTP)"
-msgstr ""
+msgstr "Cifrar fluxos de medios(SRTP)"
 
 #: ui/newaccountsettingsview.ui:1547
 msgid "Enable SDES for key exchange protocol"
@@ -810,19 +822,19 @@ msgstr "Usar TURN"
 
 #: ui/newaccountsettingsview.ui:2206
 msgid "(TURN) address"
-msgstr ""
+msgstr "Enderezo (TURN)"
 
 #: ui/newaccountsettingsview.ui:2241
 msgid "(TURN) username"
-msgstr ""
+msgstr "Nome de usuaria (TURN)"
 
 #: ui/newaccountsettingsview.ui:2275
 msgid "(TURN) password"
-msgstr ""
+msgstr "Contrasinal (TURN)"
 
 #: ui/newaccountsettingsview.ui:2312
 msgid "(TURN) realm"
-msgstr ""
+msgstr "Ámbito TURN"
 
 #: ui/newaccountsettingsview.ui:2346
 msgid "Use STUN"
@@ -830,7 +842,7 @@ msgstr "Usar STUN"
 
 #: ui/newaccountsettingsview.ui:2381
 msgid "(STUN) address"
-msgstr ""
+msgstr "Enderezo STUN"
 
 #: ui/newaccountsettingsview.ui:2414
 msgid "Published address"
@@ -850,7 +862,7 @@ msgstr "Códecs de vídeo"
 
 #: ui/newaccountsettingsview.ui:2621
 msgid "Enable video"
-msgstr ""
+msgstr "Activar vídeo"
 
 #: ui/newaccountsettingsview.ui:2648
 msgid "Audio codecs"
@@ -882,23 +894,23 @@ msgstr ""
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
-msgstr ""
+msgstr "rexistrar nome de usuario/a"
 
 #: ui/chatview.ui:39
 msgid "Send Invitation"
-msgstr ""
+msgstr "Enviar Convite"
 
 #: ui/messagingwidget.ui:76
 msgid "Record audio message"
-msgstr ""
+msgstr "Gravar mensaxe de audio"
 
 #: ui/messagingwidget.ui:96
 msgid "End without message"
-msgstr ""
+msgstr "Finalizar sen mensaxe"
 
 #: ui/incomingcallview.ui:99
 msgid "Incoming…"
-msgstr ""
+msgstr "Entrante..."
 
 #: ui/incomingcallview.ui:152
 msgid "Accept"
@@ -906,7 +918,7 @@ msgstr "Aceptar"
 
 #: ui/incomingcallview.ui:172
 msgid "Reject"
-msgstr ""
+msgstr "Rexeitar"
 
 #: ui/avatarmanipulation.ui:92 ui/avatarmanipulation.ui:125
 msgid "Take photo"
@@ -914,11 +926,11 @@ msgstr "Tomar foto"
 
 #: ui/avatarmanipulation.ui:102
 msgid "Choose image from file"
-msgstr ""
+msgstr "Escoller imaxe desde un ficheiro"
 
 #: ui/avatarmanipulation.ui:135 ui/avatarmanipulation.ui:168
 msgid "Return"
-msgstr ""
+msgstr "Devolver"
 
 #: ui/avatarmanipulation.ui:158
 msgid "Set selection as image"
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Eliminar historial"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Eliminar conversa"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contacto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
@@ -1404,7 +1416,7 @@ msgstr ""
 
 #: src/newaccountsettingsview.cpp:842
 msgid "Current password"
-msgstr ""
+msgstr "Contrasinal actual"
 
 #: src/newaccountsettingsview.cpp:848
 msgid "New password"
@@ -1412,15 +1424,15 @@ msgstr "Novo contrasinal"
 
 #: src/newaccountsettingsview.cpp:1711
 msgid "Exporting account…"
-msgstr ""
+msgstr "Exportando contrasinal..."
 
 #: src/newaccountsettingsview.cpp:1736
 msgid "Bad password"
-msgstr ""
+msgstr "Contrasinal incorrecto"
 
 #: src/newaccountsettingsview.cpp:1744
 msgid "Network error, try again"
-msgstr ""
+msgstr "Fallo na rede, ténteo de novo"
 
 #: src/newaccountsettingsview.cpp:1752
 msgid "Unknown error"
@@ -1432,15 +1444,15 @@ msgstr ""
 
 #: src/newaccountsettingsview.cpp:1824
 msgid "Error: wrong password!"
-msgstr ""
+msgstr "Erro: contrasinal incorrecto!"
 
 #: src/newaccountsettingsview.cpp:1827
 msgid "Error: unknown device!"
-msgstr ""
+msgstr "Erro: dispositivo descoñecido!"
 
 #: src/newaccountsettingsview.cpp:2000
 msgid "Initializing…"
-msgstr ""
+msgstr "Inicializando..."
 
 #: src/newaccountsettingsview.cpp:2003
 msgid "Offline"
@@ -1448,7 +1460,7 @@ msgstr "Desconectado"
 
 #: src/newaccountsettingsview.cpp:2006
 msgid "Connecting…"
-msgstr ""
+msgstr "Conectando..."
 
 #: src/newaccountsettingsview.cpp:2009
 msgid "Online"
@@ -1456,15 +1468,15 @@ msgstr "En liña"
 
 #: src/newaccountsettingsview.cpp:2013
 msgid "Unknown status"
-msgstr ""
+msgstr "Estado descoñecido"
 
 #: src/newaccountsettingsview.cpp:2046
 msgid "••••••••"
-msgstr ""
+msgstr "••••••••"
 
 #: src/newaccountsettingsview.cpp:2046
 msgid "no password set"
-msgstr ""
+msgstr "non se fixou contrasinal"
 
 #: src/newaccountsettingsview.cpp:2102
 msgid "Remove account"
diff --git a/po/he.po b/po/he.po
index f9ec3c9b33a4da581f101c781f0541fc98eecaf7..4d1b6872530b7f8e4776057ff91202d940b53cf5 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/jami/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@ msgstr "מדיה"
 msgid "Account"
 msgstr "חשבון"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -466,90 +466,102 @@ msgstr "_אודות"
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "היסטוריה"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "טהר היסטוריה"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -975,23 +987,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1212,90 +1224,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index bc928d553791eac348539019c68053414e3974bb..c1fe484c6216f633c89d796ca78f969f8741880b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/jami/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr "Medij"
 msgid "Account"
 msgstr "Račun"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Postavke"
 
@@ -465,90 +465,102 @@ msgstr "_O programu"
 msgid "_Quit"
 msgstr "_Prekini"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sustav"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Povijest"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Očisti svu povijest"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Prijenos datoteka "
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Očisti povijest"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokiraj kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 34060ac3e35e007be9ce6fa47a8024192917a258..4bf7d9b3a132e29df5a340ec2370110c2f13a667 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-25 02:15+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: . . <ovari123@zoho.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/jami/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -168,7 +168,7 @@ msgstr "Média"
 msgid "Account"
 msgstr "Fiók"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -468,90 +468,102 @@ msgstr "_Névjegy"
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Rendszer"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Indítása bejelentkezéskor"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Jami ikon megjelenítése a tálcán területen"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Hozd Jami-t a bejövő hívások előtérbe"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Értesítések engedélyezése a bejövő hívásokhoz"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Értesítések engedélyezése függőben lévő kérések esetén"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Új csevegőüzenetek értesítéseinek engedélyezése"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Csevegés nézet"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "A beszélgetések során értesítés küldése a gépelésről"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Képek és videók megjelenítése a csevegés nézetben"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "A jobb oldali csevegés megtekintése (alul, ha ki van kapcsolva)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Letöltés mappa"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Előzmények"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Előzmények megtartása (nap, 0 = korlátlan)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Az összes előzmény törlése"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Hívás felvétel"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Helyi videófelvétel"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Mindig legyen felvétel hívásokat"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Felvétel mappa"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitsebesség hívásfelvételekhez (kb/mp)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Fájlátvitel"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Részletek"
@@ -977,23 +989,23 @@ msgstr "Nem lehet regisztrálni a nevet (a felhasználónév már regisztrálva
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Nem lehet regisztrálni a nevet (hálózati hiba) – ellenőrizze a kapcsolatot."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Letöltési mappa kiválasztása"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Mentés"
@@ -1214,90 +1226,90 @@ msgstr "Fiók exportálási hiba."
 msgid "Add account…"
 msgstr "Fiók hozzáadása…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Hívás kezdeményezése"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Csevegés megnyitása"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - áttelepítés szükséges"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Az áttelepítés folyamatban van… Kérjük, ne zárja be ezt az ablakot."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Beszélgetés keresése vagy indítása"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "A beállítási oldal elhagyása"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Folyamatban lévő hívás(ok)"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr " hív!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Új kérés"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Megbízható kérelem"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Új üzenet"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "A jelenlegi hívás(ok) leállítása?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "A hívás jelenleg folyamatban van. Be kívánja zárni az ablakot és az összes jelenlegi hívást?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Előzmények törlése"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Valóban szeretné törölni ennek a csevegésnek az előzményeit?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Beszélgetés törlése"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Valóban szeretné törölni ezt a csevegését?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Kapcsolat letiltása"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Valóban szeretné letiltani ezt a kapcsolatot?"
 
diff --git a/po/id.po b/po/id.po
index fc380a154130f408c1c7b4c2188ad931e21695a2..1142e8baff1f01b73f3f6651b3834ce1ba3a42c7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/jami/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Account"
 msgstr "Akun"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Riwayat"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 3557fd798476388e4b165373ef18bf0c1f1a2a8e..4d93e34d6bd394dd0a5016b524f606d903ae5173 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-25 12:25+0000\n"
-"Last-Translator: Giordano Scarso\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/jami/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -169,7 +169,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Profilo"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -469,90 +469,102 @@ msgstr "_A proposito"
 msgid "_Quit"
 msgstr "_Chiudi"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Avvia l'applicazione al login"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostra l'icona Jami (systray) nell'area systray"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Porta Jami in primo piano con le chiamate in arrivo"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Abilita le notifiche per le chiamate in arrivo"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Abilita le notifiche per le richieste in sospeso"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Abilita le notifiche per i nuovi messaggi di chat"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Vista chat"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Mostra indicazioni di scrittura."
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Visualizza immagini e video nella vista chat"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostra vista chat a destra (in basso a sinistra)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Cartella download"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Cronologia"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr " Mantieni cronologia per (giorni, 0 = illimitato)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Cancellare tutta la cronologia"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Registrazione chiamata"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Registra video locale"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Registra sempre le chiamate"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Cartella registrazioni"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitrate per le registrazioni di chiamata (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informazioni"
@@ -978,23 +990,23 @@ msgstr "Impossibile registrare il nome (Nome utente già utilizzato)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Impossibile registrare il nome (errore di rete) - verificare la connessione."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Questa è un'operazione pericolosa. Sei sicuro di voler eliminare tutte le chat e la cronologia delle chiamate?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Scegli la cartella di download"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Salva"
@@ -1215,90 +1227,90 @@ msgstr " Esportazione account non riuscito."
 msgid "Add account…"
 msgstr "Aggiungi account…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Effettua chiamata"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "apri chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Migrazione necessaria"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migrazione in corso... si prega di non chiudere questa finestra."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Cerca o inizia una conversazione"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Esci dalla pagina delle impostazioni"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Ci sono chiamate attive"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "ti sta chiamando!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nuova richiesta da"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Richiesta fidata"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Interrompe la chiamata corrente?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Svuotare lo storico"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Rimuovi conversazione"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Vuoi davvero rimuovere questa conversazione?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blocca contatto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Vuoi davvero bloccare questo contatto?"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index faad43fde828fcde986019dfb875fd5746fc46a9..5e8e05d3a40d48fcf6aa2fb34e40447669130dfe 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-25 07:20+0000\n"
-"Last-Translator: albanobattistella <albano_battistella@hotmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/jami/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,7 +170,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Utente"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Opzioni"
 
@@ -470,90 +470,102 @@ msgstr "_Riguardo a"
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Avvia l'applicazione al login"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostra l'icona Jami (systray) nell'area systray"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Porta Jami in primo piano sulle chiamate in arrivo"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Abilita le notifiche per le chiamate in arrivo"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Abilita le notifiche per le richieste in sospeso"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Abilita le notifiche per i nuovi messaggi di chat"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Vista chat"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Mostra indicazioni di battitura"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Visualizza immagini e video nella vista chat"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostra la vista della chat sulla destra (in basso, se disattivata)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Scarica la cartella"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Cronologia"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Mantieni cronologia per (giorni, 0 = illimitato)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Pulisci la cronologia"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Registrazione delle chiamate"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Registra video locale"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Registra sempre le chiamate"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Registra cartella"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitrate per le registrazioni delle chiamate (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "informazioni"
@@ -979,23 +991,23 @@ msgstr "Impossibile registrare il nome (Nome utente già utilizzato)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Impossibile registrare il nome (errore di rete) - verificare la connessione."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Scegli la cartella di download"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Salva"
@@ -1216,90 +1228,90 @@ msgstr "Esportazione account fallito."
 msgid "Add account…"
 msgstr "Aggiungi account…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "chiama"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "apri chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami: Migrazione necessaria"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migrazione in corso ... non chiudere questa finestra."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Cerca o avvia una conversazione"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Lascia la pagina delle impostazioni"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Ci sono chiamate attive"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "ti sta chiamando!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chiamata in ingresso"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nuova richiesta da"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Richiesta fidata"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Interrompe la chiamata corrente?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Una chiamata è attualmente in corso. Vuoi chiudere la finestra e interrompere tutte le chiamate correnti?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Elimina cronologia"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Vuoi davvero cancellare la cronologia di questa conversazione?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Rimuovi conversazione"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Vuoi davvero rimuovere questa conversazione?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blocca contatto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Vuoi davvero bloccare questo contatto?"
 
diff --git a/po/ja.po b/po/ja.po
index 7e6ae3ecd4ab5f7b6e98c450b446c7a890c1e26a..6b2182bc1f3155cf941b1ba270ccb3fb2b5919a9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-15 22:12+0000\n"
-"Last-Translator: Toshiya Saito\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Atsushi Abe <exass-kazaori.phonoscape@nifty.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/jami/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -168,7 +168,7 @@ msgstr "メディア"
 msgid "Account"
 msgstr "アカウント"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "設定"
 
@@ -421,7 +421,7 @@ msgid ""
 "This account only exists on this device. If you lost your device or "
 "uninstall the application, your account will be deleted. You can backup your"
 " account now or later."
-msgstr ""
+msgstr "このアカウントはこのデバイスにしか保存されていません。デバイスを失くすかアプリケーションをアンインストールすると、アカウントが削除されます。できる限り速やかにアカウントをバックアップしてください。"
 
 #: ui/accountcreationwizard.ui:789
 msgid "Never show me this again"
@@ -430,7 +430,7 @@ msgstr "今後表示しない"
 #: ui/accountcreationwizard.ui:803 ui/newaccountsettingsview.ui:539
 #: src/accountcreationwizard.cpp:380 src/newaccountsettingsview.cpp:2035
 msgid "Export account"
-msgstr ""
+msgstr "アカウントをエクスポート"
 
 #: ui/accountcreationwizard.ui:813
 msgid "Skip"
@@ -468,90 +468,102 @@ msgstr "Ringについて(_A)"
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "システム"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "通知"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
-msgstr ""
+msgstr "着信の通知を有効化"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "ダウンロードフォルダー"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "履歴"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "履歴をすべて削除"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "通話の録音"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
-msgstr ""
+msgstr "ローカルビデオを録画"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "常に通話を録音"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
-msgstr ""
+msgstr "記録フォルダー"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "ファイル転送"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -673,7 +685,7 @@ msgstr "プロキシ"
 
 #: ui/newaccountsettingsview.ui:819
 msgid "Voicemail"
-msgstr ""
+msgstr "ボイスメール"
 
 #: ui/newaccountsettingsview.ui:925
 msgid "Known devices linked to this Jami account"
@@ -697,23 +709,23 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:1108
 msgid "Call settings"
-msgstr ""
+msgstr "通話設定"
 
 #: ui/newaccountsettingsview.ui:1146
 msgid "Allow call from untrusted peers"
-msgstr ""
+msgstr "信頼できないピアからの通話を許可する"
 
 #: ui/newaccountsettingsview.ui:1181
 msgid "Auto answer calls"
-msgstr ""
+msgstr "自動応答"
 
 #: ui/newaccountsettingsview.ui:1217
 msgid "Custom ringtone"
-msgstr ""
+msgstr "カスタム着信音"
 
 #: ui/newaccountsettingsview.ui:1261
 msgid "Name server"
-msgstr ""
+msgstr "ネームサーバー"
 
 #: ui/newaccountsettingsview.ui:1298 ui/newaccountsettingsview.ui:2487
 msgid "Address"
@@ -721,7 +733,7 @@ msgstr "アドレス"
 
 #: ui/newaccountsettingsview.ui:1332
 msgid "OpenDHT configuration"
-msgstr ""
+msgstr "OpenDHT設定"
 
 #: ui/newaccountsettingsview.ui:1416
 msgid "Auto connect on local network"
@@ -737,15 +749,15 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:1547
 msgid "Enable SDES for key exchange protocol"
-msgstr ""
+msgstr "鍵交換プロトコルでSDESを有効化"
 
 #: ui/newaccountsettingsview.ui:1583
 msgid "Fallback on RTP on encryption failure"
-msgstr ""
+msgstr "暗号化失敗時のRTP上のフォールバック"
 
 #: ui/newaccountsettingsview.ui:1618
 msgid "Encrypt negotiation (TLS)"
-msgstr ""
+msgstr "折衝を暗号化 (TLS)"
 
 #: ui/newaccountsettingsview.ui:1653
 msgid "CA certificate"
@@ -769,11 +781,11 @@ msgstr "TLSプロトコル方式"
 
 #: ui/newaccountsettingsview.ui:1835
 msgid "Outgoing TLS server name"
-msgstr ""
+msgstr "送信TLSサーバー名"
 
 #: ui/newaccountsettingsview.ui:1870
 msgid "Negotiation timeout (seconds)"
-msgstr ""
+msgstr "折衝タイムアウト (秒)"
 
 #: ui/newaccountsettingsview.ui:1906
 msgid "Verify incoming certificates (server side)"
@@ -781,11 +793,11 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:1941
 msgid "Verify answer certificates (client side)"
-msgstr ""
+msgstr "アンサー証明書を検証 (クライアント側)"
 
 #: ui/newaccountsettingsview.ui:1976
 msgid "Require a certificate for incoming TLS connections"
-msgstr ""
+msgstr "受信TLS接続は証明書が必要です"
 
 #: ui/newaccountsettingsview.ui:2000
 msgid "Security"
@@ -793,19 +805,19 @@ msgstr "セキュリティ"
 
 #: ui/newaccountsettingsview.ui:2025
 msgid "Connectivity"
-msgstr ""
+msgstr "接続性"
 
 #: ui/newaccountsettingsview.ui:2063
 msgid "Registration expire timeout (seconds)"
-msgstr ""
+msgstr "登録期限のタイムアウト(秒)"
 
 #: ui/newaccountsettingsview.ui:2100
 msgid "Network interface"
-msgstr ""
+msgstr "ネットワークインターフェース"
 
 #: ui/newaccountsettingsview.ui:2136
 msgid "UPnP"
-msgstr ""
+msgstr "UPnP"
 
 #: ui/newaccountsettingsview.ui:2171
 msgid "Use TURN"
@@ -837,11 +849,11 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:2414
 msgid "Published address"
-msgstr ""
+msgstr "発行されたアドレス"
 
 #: ui/newaccountsettingsview.ui:2451
 msgid "Use custom address and port"
-msgstr ""
+msgstr "カスタムのアドレスとポート番号を使用"
 
 #: ui/newaccountsettingsview.ui:2522
 msgid "Port"
@@ -849,7 +861,7 @@ msgstr "ポート番号"
 
 #: ui/newaccountsettingsview.ui:2558
 msgid "Video codecs"
-msgstr ""
+msgstr "動画コーデック"
 
 #: ui/newaccountsettingsview.ui:2621
 msgid "Enable video"
@@ -857,11 +869,11 @@ msgstr "ビデオを有効化"
 
 #: ui/newaccountsettingsview.ui:2648
 msgid "Audio codecs"
-msgstr ""
+msgstr "音声コーデック"
 
 #: ui/newaccountsettingsview.ui:2718
 msgid "SDP Session Negotiation (ICE Fallback)"
-msgstr ""
+msgstr "SDPセッションネゴシエーション (ICEフォールバック)"
 
 #: ui/newaccountsettingsview.ui:2730
 msgid "Only used during SDP negotiation in case ICE is not supported."
@@ -977,23 +989,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "この操作は取り消すことができません。本当にあなたのすべてのチャットと通話の履歴を削除しますか?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "保存(_S)"
@@ -1214,90 +1226,90 @@ msgstr ""
 msgid "Add account…"
 msgstr "アカウントを追加…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "通話を開始"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "チャットを開く"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "着信"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "履歴をクリア"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "会話の履歴を消去してもよろしいですか?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "ブロックした連絡先"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/ko_KR.po b/po/ko_KR.po
index 10bbfc667e00388179b98574fad17c24902d88b7..333ddf2980b7b99252da4a588e935859fc6b67ae 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/jami/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Account"
 msgstr "계정"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "설정"
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 256d25b8a3133f849fb67b9680e1403e7335adc4..42a7aa83fb408da2cdf3722b09b8c904715878b2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Moo\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/jami/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +167,7 @@ msgstr "Medija"
 msgid "Account"
 msgstr "Paskyra"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Nustatymai"
 
@@ -467,90 +467,102 @@ msgstr "_Apie"
 msgid "_Quit"
 msgstr "_IÅ¡eiti"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Paleisti programą įjungus kompiuterį"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Rodyti Jami piktogramÄ… sistemos dÄ—klo srityje"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Gaunant skambučius, rodyti Jami priekiniame plane"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Įjungti pranešimus gaunamiesiems skambučiams"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Įjungti pranešimus apie laukiančias užklausas"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Įjungti pranešimus apie naujas pokalbio žinutes"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Pokalbio rodinys"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Rodyti pokalbio rodinyje paveikslus ir vaizdo įrašus"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Rodyti pokalbio rodinį dešinėje (jei išjungta, apačioje)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Atsiuntimų aplankas"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Istorija"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Kiek dienų laikyti istoriją (0 = neribotai)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "IÅ¡valyti visÄ… istorijÄ…"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Visada įrašinėti skambučius"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Failų persiuntimas"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informacija"
@@ -976,23 +988,23 @@ msgstr "Nepavyko registruoti vardo (Naudotojo vardas jau užimtas)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Nepavyko registruoti vardo (Tinklo klaida) - patikrinkite savo ryšį."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "Į_rašyti"
@@ -1213,90 +1225,90 @@ msgstr "Paskyros eksportavimas nepavyko."
 msgid "Add account…"
 msgstr "Pridėti paskyrą…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "skambinti"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "atverti pokalbį"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Išeiti iš nustatymų puslapio"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr " jums skambina!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Gaunamasis skambutis"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nauja žinutė"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "IÅ¡valyti istorijÄ…"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Ar tikrai norite išvalyti šio pokalbio istoriją?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Šalinti pokalbį"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Ar tikrai norite pašalinti šį pokalbį?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Užblokuoti adresatą"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Ar tikrai norite užblokuoti šį adresatą?"
 
diff --git a/po/ms.po b/po/ms.po
index be0ab4bb03d3b832078088147178b6b81eac34fa..985507da13e34581ca5dcfd71823f40a232f7904 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/jami/language/ms/)\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Akaun"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Aturan"
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Sejarah"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Panggilan masuk"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Padamkan sejarah"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 5e28678417cbe848e0f740ffa58c4269ec84791e..6343a9910fbf7f69dd19a9196768f97c19fdf20b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-10 09:08+0000\n"
-"Last-Translator: bablecopherye <ahh-produktivitet@tutanota.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/jami/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,7 +166,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -466,90 +466,102 @@ msgstr "_Om"
 msgid "_Quit"
 msgstr "Av_slutt"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Start programmet ved innlogging"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Vis Jami-ikon (systemkurv) i systemkurvområdet"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Ta Ring i forgrunnen når noen ringer"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Varsler"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Aktiver varsler for innkommende samtaler"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Aktiver varsler for utestående henvendelser"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Aktiver varsler for nye meldinger"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Meldingsvisning"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Vis bilder og filmer i meldingsvisning"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Vis meldingsvisning til høyre (nederst hvis avslått)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Nedlastingsmappe"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historie"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Behold historikk i (dager, 0 = for evig)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Nullstill all historikk"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Filoverføring"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -975,23 +987,23 @@ msgstr "Klarte ikke registrere navn (brukernavnet er allerede i bruk)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Klarte ikke registrere navn (Nettverksfeil) - sjekk forbindelsen din."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Velg nedlastingsmappe"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Lagre"
@@ -1212,90 +1224,90 @@ msgstr "Feil ved eksport av konto."
 msgid "Add account…"
 msgstr "Legg til konto"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "utfør samtale"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ã¥pne sludring"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Forlag oppsettside"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Det er pågående samtaler"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "ringer deg!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Ny henvendelse fra"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Stol på henvendelse"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Ny melding"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Stopp gjeldene samtale?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "En samtale er oppkoblet.  Ønsker du å lukke vinduet og avslutte alle samtaler?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Slett historikk"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Ønsker du virkelig å nullstille historikken for denne samtalen?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Fjern samtale"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Ønsker du virkelig å fjerne denne samtalen?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokker kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Ønsker du virkelig å blokkere denne kontakten?"
 
diff --git a/po/nl.po b/po/nl.po
index 9976e0d8e4541a70f8c09afa590f207d14b9f805..b449fa5bff85c3f76a0472211a075ec128dc2c32 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/jami/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +167,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Account"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -467,90 +467,102 @@ msgstr "_Over"
 msgid "_Quit"
 msgstr "Af_sluiten"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Systeem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Toepassing starten bij aanmelden"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Jami-pictogram (systray) weergeven in systeemvak"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Jami naar voorgrond brengen bij inkomende oproepen"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Meldingen inschakelen voor inkomende oproepen"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Meldingen inschakelen voor lopende verzoeken"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Meldingen inschakelen voor nieuwe chatberichten"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Gespreksweergave"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Afbeeldingen en video’s in chatvenster weergeven"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Gespreksweergave rechts weergeven (indien uitgeschakeld: onderaan)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Downloadmap"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Geschiedenis bewaren voor (dagen, 0 = onbeperkt)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Oproepopname"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Lokale video opnemen"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Oproepen altijd opnemen"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Opnamemap"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitrate voor oproepopnamen (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Bestandsoverdracht"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informatie"
@@ -976,23 +988,23 @@ msgstr "Kan naam niet registreren (gebruikersnaam is al in gebruik)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Kan naam niet registreren (netwerkfout) - controleer uw verbinding."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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 u zeker dat u uw volledige gespreks- en oproepgeschiedenis wilt wissen?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "Op_slaan"
@@ -1213,90 +1225,90 @@ msgstr "Fout bij exporteren van account."
 msgid "Add account…"
 msgstr "Account toevoegen…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - migratie vereist"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Instellingspagina verlaten"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Er zijn actieve oproepen"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "belt u!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nieuw verzoek van"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Vertrouwensverzoek"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nieuw bericht"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Huidige oproep beëindigen?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Geschiedenis wissen"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Gesprek verwijderen"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Wilt u dit gesprek echt verwijderen?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Contact blokkeren"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Wilt u dit contact echt blokkeren?"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index a62195c9eab02602d3bef946dd4ecce02db36e17..21accf0936929e18f1fd7381e681b9fe5fe656a6 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/jami/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Account"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -467,90 +467,102 @@ msgstr "_Over"
 msgid "_Quit"
 msgstr "Af_sluiten"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Systeem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Toepassing starten bij aanmelden"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Jami-pictogram (systray) weergeven in systeemvak"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Jami naar voorgrond brengen bij inkomende oproepen"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Meldingen inschakelen voor inkomende oproepen"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Meldingen inschakelen voor lopende verzoeken"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Meldingen inschakelen voor nieuwe chatberichten"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Gespreksweergave"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Afbeeldingen en video’s in chatvenster weergeven"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Gespreksweergave rechts weergeven (indien uitgeschakeld: onderaan)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Downloadmap"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Geschiedenis bewaren voor (dagen, 0 = onbeperkt)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Geschiedenis wissen"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Oproepopname"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Lokale video opnemen"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Oproepen altijd opnemen"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Opnamemap"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bitrate voor oproepopnames (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informatie"
@@ -976,23 +988,23 @@ msgstr "Kan naam niet registreren (gebruikersnaam is reeds in gebruik)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Kan naam niet registreren (netwerkfout) - controleer uw verbinding."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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 u zeker dat u uw volledige gespreks- en oproepgeschiedenis wilt wissen?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "Op_slaan"
@@ -1213,90 +1225,90 @@ msgstr "Fout bij exporteren van account."
 msgid "Add account…"
 msgstr "Account toevoegen…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - migratie vereist"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migratie is bezig… Gelieve dit venster niet te sluiten."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Instellingsblad verlaten"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Er zijn actieve oproepen"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "belt u!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nieuw verzoek van"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Vertrouwensverzoek"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nieuw bericht"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Huidige oproep beëindigen?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "U bent momenteel in gesprek. Wilt u het venster sluiten en alle huidige oproepen beëindigen?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Geschiedenis wissen"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Wilt u de geschiedenis van dit gesprek wissen?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Gesprek verwijderen"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Wilt u dit gesprek echt verwijderen?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Contact blokkeren"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Wilt u dit contact echt blokkeren?"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 9c5b94cc0fcd7394491a2eea1cd884b481cc7d62..2280f4b69519b6d17cae87118a53a02151fa52fe 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/jami/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "Media"
 msgid "Account"
 msgstr ""
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index ca23232beaec61de11ae372f0749d55209401ec9..f91c16754f4186a2c245bc910fe4cea0f0437c96 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Gursharnjit Singh <gursharnjitsingh13@gmail.com>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/savoirfairelinux/jami/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +165,7 @@ msgstr "ਮੀਡੀਆ"
 msgid "Account"
 msgstr "ਖਾਤਾ"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
@@ -465,90 +465,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "ਸਿਸਟਮ"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "ਇਤਿਹਾਸ"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "ਫ਼ਾਈਲ ਤਬਾਦਲਾ"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "ਆਉਂਦੀ ਕਾਲ"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "ਇਤਿਹਾਸ ਮਿਟਾਓ"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 996b3d519c44d851e623ba13375cf230d7f48147..879273fb55a77dbe671b13f35bde48030de878f8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Jan Wielkiewicz <grzybowawspulnota@cock.li>\n"
 "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/jami/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +167,7 @@ msgstr "Multimedia"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -467,90 +467,102 @@ msgstr "_O"
 msgid "_Quit"
 msgstr "_Wyjdź"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Uruchom aplikacjÄ™ przy starcie"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Pokaż ikonę Jami w obszarze pasku startowego (systray)"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Przenieś Jami na pierwszy plan przy połączeniach przychodzących"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Zezwól na powiadomienia dla połączeń przychodzących."
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Zezwól na powiadomienia dla oczekujących zaproszeń"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Zezwól na powiadomienia dla nowych wiadomości"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Widok chatu"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Pokaż obrazki i filmy w oknie chatu."
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Pokaż widok chatu na prawo (na dole, jeżeli wyłączone)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Folder pobrane"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historia"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Przechowaj historiÄ™ przez (dni, 0 = nieograniczone):"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Usuń całą historię"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transfer pliku"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -976,23 +988,23 @@ msgstr "Nie udało się zarejestrować nazwy (Nazwa jest już zajęta)"
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Nie udało się zarejestrować nazwy (Błąd sieci) - sprawdź swoje połączenie."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Zapisz"
@@ -1213,90 +1225,90 @@ msgstr "BÅ‚Ä…d podczas eksportowania"
 msgid "Add account…"
 msgstr "Dodaj konto..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Zadzwoń"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Otwórz chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Opuść stronę ustawień"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "SÄ… aktywne rozmowy"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "dzwoni do Ciebie!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Połączenie przychodzące"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nowe zaproszenie od"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "RzÄ…danie zaufania"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nowa wiadomość"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Zatrzymać aktualną rozmowę?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Rozmowa jest w trakcie. Czy chcesz zamknąć okno i wyłączyć wszystkie bieżące rozmowy?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Wyczyść historię"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Czy na pewno chcesz wyczyścić historię tej rozmowy?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Usuń rozmowę"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Czy na pewno chcesz usunąć tą rozmowę?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokuj kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Czy na pewno chcesz zablokować ten kontakt?"
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f9b99bff732f440c5b3c45fe1c17e5f6a1ba3faf..57b1cb8c698266ad84fc88a72481e5f39f083f2d 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Jan Wielkiewicz <grzybowawspulnota@cock.li>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/savoirfairelinux/jami/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,7 +166,7 @@ msgstr "Multimedia"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -466,90 +466,102 @@ msgstr "_O"
 msgid "_Quit"
 msgstr "_Wyjdź"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historia"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Usuń całą historię"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transfer pliku"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -975,23 +987,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Zapisz"
@@ -1212,90 +1224,90 @@ msgstr "BÅ‚Ä…d podczas eksportowania"
 msgid "Add account…"
 msgstr "Dodaj konto..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Zadzwoń"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Otwórz chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Opuść stronę ustawień"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "dzwoni do Ciebie!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Połączenie przychodzące"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nowe zaproszenie od"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "RzÄ…danie zaufania"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nowa wiadomość"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Wyczyść historię"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blokuj kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index a804581bd405a45f10b762975dd0b670d3dacff8..084145296e087369b901f03c98d8dcf253a9be2b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Rui <xymarior@yandex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/jami/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +167,7 @@ msgstr "Média"
 msgid "Account"
 msgstr "Conta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Configurações"
 
@@ -467,90 +467,102 @@ msgstr "_Sobre"
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Iniciar a aplicação ao autenticar-me"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostrar ícone do Jami na área de notificações"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Trazer o Jami para o primeiro plano ao receber chamadas"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Ativar notificações para chamadas recebidas"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Ativar notificações para pedidos pendentes"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Ativar notificações para novas mensagens nas conversas"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Janela de conversas"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Mostrar imagens e vídeos na janela das conversas"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostrar a janela de conversas à direita (no fundo se desativado)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Pasta de descarregamentos"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Manter histórico por (dias; 0 = ilimitado)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferência de ficheiro"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informações"
@@ -976,23 +988,23 @@ msgstr "Não foi possível registar o nome (nome de utilizador já registado)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Não foi possível registar o nome (erro de rede) - verifique a sua ligação à rede."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Gravar"
@@ -1213,90 +1225,90 @@ msgstr "Falha ao exportar a conta."
 msgid "Add account…"
 msgstr "Adicionar conta…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer chamada"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir conversa"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Deixar página de configurações"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Existem chamadas ativas"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "está a telefonar-lhe!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chamada recebida"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Novo pedido de"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Confiar no pedido"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nova mensagem"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Parar a chamada atual?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Limpar histórico"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Quer mesmo eliminar o histórico desta conversação?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Remover conversação"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Quer mesmo remover esta conversação?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contacto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Quer mesmo bloquear este contacto?"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cb4c73e4b0338dee635add7093d699fed9765657..ae64f61403a56010e70891e409f8ac0522227b5d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: The Cat\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/jami/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -181,7 +181,7 @@ msgstr "Mídia"
 msgid "Account"
 msgstr "Conta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Configurações"
 
@@ -481,90 +481,102 @@ msgstr "_Sobre"
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Iniciar Jami ao logar"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostrar ícone do Jami na bandeja do sistema"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Trazer o Jami para o primeiro plano ao receber chamadas"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Habilitar notificações de área de trabalho para chamadas"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Ativar notificações para solicitações pendentes."
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Habilitar notificações para novas mensagens no chat"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Janela do chat"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Exibir imagens e vídeos na janela do chat"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostre a janela do chat na lateral direita (na parte inferior se desligada)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Pasta de downloads"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Manter histórico por (dias, 0 = ilimitado)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Transferência de arquivo"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -990,23 +1002,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Escolha a pasta de arquivos baixados"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Salvar"
@@ -1227,90 +1239,90 @@ msgstr "Falha ao exportar a conta."
 msgid "Add account…"
 msgstr "Adicionar conta…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer ligação"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Deixar a página de configurações"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "está chamando você!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chamada recebida"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nova requisição de"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Confiar na requisição"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nova mensagem"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Limpar histórico"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contato"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 57f5cbbeae25fe485ef62616223183b4f6abb116..bf6947e09a0067907ece0c07d691c144ba1a07d9 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-05 16:16+0000\n"
-"Last-Translator: a0cae6accafe109fb133bd33ecb37bd3\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/jami/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,7 +166,7 @@ msgstr "Média"
 msgid "Account"
 msgstr "Conta"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Configurações"
 
@@ -466,90 +466,102 @@ msgstr "_Sobre"
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistema"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Iniciar a aplicação ao autenticar-me"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Mostrar ícone do Jami na área de notificações"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Trazer o Jami para o primeiro plano ao receber chamadas"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Ativar notificações para chamadas recebidas"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Ativar notificações para pedidos pendentes"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Ativar notificações para novas mensagens nas conversas"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Janela de conversas"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Mostrar indicação ao escrever"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Mostrar imagens e vídeos na janela das conversas"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Mostrar a janela de conversas à direita (no fundo se desativado)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Pasta de descarregamentos"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Histórico"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Manter histórico por (dias; 0 = ilimitado)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Limpar histórico"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "A Gravar Chamada"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Gravar vídeo local"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Gravar sempre as chamadas"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Pasta de gravações"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Taxa de bits das gravações de chamada (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informações"
@@ -975,23 +987,23 @@ msgstr "Não foi possível registar o nome (nome de utilizador já registado)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Não foi possível registar o nome (erro de rede) - verifique a sua ligação à rede."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Gravar"
@@ -1212,90 +1224,90 @@ msgstr "Falha ao exportar a conta."
 msgid "Add account…"
 msgstr "Adicionar conta…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer chamada"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir conversa"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Migração requerida"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migração em progresso... por favor não feche esta janela."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Encontrar ou iniciar uma conversa"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Deixar página de configurações"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Existem chamadas ativas"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "está a telefonar-lhe!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Chamada recebida"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Novo pedido de"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Confiar no pedido"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nova mensagem"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Parar a chamada atual?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Está a decorrer uma chamada. Quer fechar a janela e parar todas as chamadas?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Limpar histórico"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Quer mesmo eliminar o histórico desta conversação?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Remover conversação"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Quer mesmo remover esta conversação?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bloquear contacto"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Quer mesmo bloquear este contacto?"
 
diff --git a/po/ring-client-gnome.pot b/po/ring-client-gnome.pot
index d6080d640a1ddc42623205d0ebf34e30b420eb31..773c68db91b49e4f4eafdcbf89456bebd7f7cca5 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: 2020-04-27 03:09-0400\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\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"
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr ""
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your "
 "chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the "
 "layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr ""
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index b348bb926b196a628c7b7916062d829c9cf5f8db..7ace0349ea0f1d33ae281e11050ff9577b7dfdfd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/jami/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr "Media"
 msgid "Account"
 msgstr ""
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Setari"
 
@@ -464,90 +464,102 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr ""
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr ""
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -973,23 +985,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1210,90 +1222,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Apel de intrare"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Ștergere istoric"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blocați contactul"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index dc19e019cfdedcd51305bd2ca993eddac5fc8d4f..95e517305c248037ff76533054eb0ed00bf16ee7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alexander Krotov, 2019
+# link2xt, 2019
 # Андрей Шевчук <andrei@shevchuk.co>, 2016
 # Andrey, 2017
 # Anton Samarchyan <desecho@gmail.com>, 2016
@@ -31,9 +31,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-03 17:05+0000\n"
-"Last-Translator: Ilia Draga\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Vladimir Stoiakin\n"
 "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/jami/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -188,7 +188,7 @@ msgstr "Медиа"
 msgid "Account"
 msgstr "Аккаунт"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Настройки"
 
@@ -488,90 +488,102 @@ msgstr "_О программе"
 msgid "_Quit"
 msgstr "_Выход"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Система"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Запускать приложение при входе в систему"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Показывать значок Jami в системном лотке"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Выводить Jami на передний план при входящих звонках"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Включить уведомления о входящих звонках."
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Включить уведомления об ожидающих запросах"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Включить уведомления о новых сообщениях чата"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Чат"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Оповещать о наборе текста"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Показывать изображения и видео в окне чата"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Показывать чат справа (если отключено — внизу)."
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Папка для загрузок"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "История"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Хранить историю (дней, 0 = неограниченно)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Очистить историю"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Запись разговоров"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Записывать своё видео"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Всегда записывать разговоры"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Папка для записей"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Битрейт для записи разговоров (кб/с)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Передача файла"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Информация"
@@ -997,23 +1009,23 @@ msgstr "Невозможно зарегистрировать имя (Имя п
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Невозможно зарегистрировать имя (Ошибка сети) - проверьте ваше соединение. "
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Это разрушительная операция. Вы уверены, что хотите удалить всю вашу историю чатов и звонков?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Сохранить"
@@ -1234,90 +1246,90 @@ msgstr "Экспорт аккаунта не выполнен."
 msgid "Add account…"
 msgstr "Добавить аккаунт…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "позвонить"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "открыть чат"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - необходима миграция"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Идет миграция... пожалуйста, не закрывайте это окно."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Найти или начать разговор"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Выйти из настроек"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Есть активные звонки"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "звонит вам!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Входящий вызов"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Новый запрос от"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Запрос доверия"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Новое сообщение"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Завершить текущий звонок?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Очистить историю"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Вы действительно хотите очистить историю этой переписки? "
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Удалить диалог"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Вы действительно хотите удалить этой переписку? "
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Заблокировать контакт"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Вы действительно хотите заблокировать этот контакт?"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 7dbeb56f70734c1c03b44f0eeb86f220168dffc0..4bf9e6a2788c38b32569a7b13783b0578945e0d4 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-03 17:32+0000\n"
-"Last-Translator: Ilia Draga\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Марат Хазиев <mkhaziev6@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/jami/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,7 +170,7 @@ msgstr "Медиа"
 msgid "Account"
 msgstr "Учётная запись"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Настройки"
 
@@ -470,90 +470,102 @@ msgstr "_О программе"
 msgid "_Quit"
 msgstr "_Выход"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Система"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Запускать приложение при входе в систему"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Показывать значок Jami в системном лотке"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Выводить Jami на передний план при входящих звонках"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Включить уведомления о входящих звонках."
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Включить уведомления об ожидающих запросах"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Включить уведомления о новых сообщениях чата"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Чат"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Показывать изображения и видео в окне чата"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Показывать чат справа (если отключено — внизу)."
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Папка для загрузок"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "История"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Хранить историю (дней, 0 = неограниченно)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Очистить историю"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Передача файлов"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -979,23 +991,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Это разрушительная операция. Вы уверены, что хотите удалить всю вашу историю чатов и звонков?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Сохранить"
@@ -1216,90 +1228,90 @@ msgstr "Экспорт аккаунта не выполнен."
 msgid "Add account…"
 msgstr "Добавить аккаунт…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "позвонить"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "открыть чат"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Выйти из настроек"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Есть активные звонки"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "звонит вам!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Входящий вызов"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Новый запрос от "
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Запрос доверия"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Новое сообщение"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Завершить текущий звонок?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "В настоящее время идёт беседа. Хотите закрыть окно и остановить все текущие вызовы?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Очистить историю"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Заблокировать контакт"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 6f7f5615a61d9a1504b174a85f5fc6a459f32051..2721cbc1d462c621d51534bafcea00950ae3c3d3 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: Tomáš Vavro <tomas.j.vavro@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/jami/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,7 +166,7 @@ msgstr "Médiá"
 msgid "Account"
 msgstr "Účet"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Nastavenia"
 
@@ -466,90 +466,102 @@ msgstr "_Informácie"
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Systém"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Spustiť aplikáciu pri prihlásení"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Zobrazovať ikonu Jami (systémovú) medzi systémovými ikonami"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Premiestniť Jami do popredia, ak prichádza hovor"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Notifikácie"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Zapnúť upozornenia na prichádzajúce hovory"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Zapnúť notifikácie pre čakajúce žiadosti"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Zapnúť notifikácie pre nové správy"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Zobrazenie chatu"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Zobrazovať obrázky a videá v náhľade chatu"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Zobraziť náhľad chatu napravo (predvolene dolu)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Priečinok na stiahnutie"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "História"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Uchovať históriu po dobu (dni, 0 = neobmedzene)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Vymaž celú historiu"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Prenos súborov"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -975,23 +987,23 @@ msgstr "Nie je možné registrovať meno (Používateľské meno už je zabrané
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Táto operácia je deštruktívna. Naozaj chcete odstrániť celú vašu históriu chatu a hovorov?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Zvoliť priečinok na sťahovanie"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Uložiť"
@@ -1212,90 +1224,90 @@ msgstr "Zlyhanie exportu účtu."
 msgid "Add account…"
 msgstr "Pridať účet..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "uskutočniť hovor"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "otvoriť chat"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Opustiť nastavenia"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "vám volá!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Prichádzajúci hovor"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Nová žiadosť od"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Veriť žiadosti"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nová správa"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Vymazať históriu"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Zablokovať kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index c7055bce89268ba68732cc87c9dde082bf8bceea..603361d32269e6e644e0219e1d3e9c8138393416 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/jami/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "Mediji"
 msgid "Account"
 msgstr "Račun"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Nastavitve"
 
@@ -465,90 +465,102 @@ msgstr "_O programu"
 msgid "_Quit"
 msgstr "_Izhod"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Zgodovina"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Počisti vso zgodovino"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -974,23 +986,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1211,90 +1223,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "izvedi klic"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "odpri pogovor"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Pobriši zgodovino"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/sq_AL.po b/po/sq_AL.po
index e14f55d66263b320686aea02b6c45adfe854d362..6f78b002b905553539a8487524237f3db60c2ad0 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Besnik Bleta <besnik@programeshqip.org>, 2020
 # Besnik Bleta <besnik@programeshqip.org>, 2016-2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 11:59+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/jami/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +166,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Llogari"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Rregullime"
 
@@ -465,90 +466,102 @@ msgstr "_Rreth"
 msgid "_Quit"
 msgstr "_Dil"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Sistem"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Nise aplikacionin kur bëhet hyrja në sistem"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Shfaq ikonë (systray) Jami te fusha e njoftimeve"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Sille Jami-n përpara për thirrje ardhëse"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Njoftime"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Aktivizo njoftimet për thirrje ardhëse"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Aktivizo njoftime për kërkesa pezull"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Aktivizo njoftimet për mesazhe të reja fjalosjesh"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Pamje fjalosjeje"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Shfaq shenja shtypjeje"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Shfaq te pamja e fjalosjes figura dhe video"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Shfaqe pamjen e fjalosjes djathtas (poshtë, nëse është off)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Dosje Shkarkimi"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historik"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Mbaje historikun për (ditë, 0 = pa kufizim)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Spastro krejt historikun"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Incizim Thirrjesh"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Regjistro video lokale"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Incizoji përherë thirrjet"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Dosje incizimesh"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Vlerë bitrate për incizime thirrjesh (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Shpërngulje kartelash"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Informacione"
@@ -974,23 +987,23 @@ msgstr "S’arrihet të regjistrohet emër (Emër përdoruesi i zënë tashmë).
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "S’arrihet të regjistrohet emër (Gabim rrjeti) - kontrolloni lidhjen tuaj."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Zgjidhni dosje shkarkimesh"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Anuloje"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Ruaje"
@@ -1067,7 +1080,7 @@ msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
 "\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr "“I lirë si në Liri”\nngritur mbi %.25s"
+msgstr "“I lirë si në Liri”\nmontuar më %.25s"
 
 #: src/dialogs.c:137
 msgid ""
@@ -1211,90 +1224,90 @@ msgstr "Dështim eksportimi llogarie."
 msgid "Add account…"
 msgstr "Shtoni llogari…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "bëni një thirrje"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "hape fjalosjen"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Lypset migrim"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migrim në kryerje e sipër… ju lutemi, mos e mbyllni këtë dritare."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Gjeni ose filloni një bisedë"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Braktise faqen e rregullimeve"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Ka thirrje aktive"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr " po ju thërret!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Thirrje ardhëse"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Kërkesë e re nga "
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Kërkesë besueshmërie"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Mesazh i ri"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Të ndalet thirrja e tanishme?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Ka një thirrje në kryerje e sipër. Doni të mbyllet dritarja dhe të ndalen krejt thirrjet e tanishme?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Spastroje historikun"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Doni të spastrohet vërtet historiku i kësaj bisede?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Hiqe bisedën"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Doni të hiqet vërtet kjo bisedë?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Bllokojeni kontaktin"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Doni të bllokohet vërtet ky kontakt?"
 
diff --git a/po/sv.po b/po/sv.po
index cdbfe3fac45209a5f72b0048657335f11a6b925b..973edd302382fd4bc811590ca7d517695572b681 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 09:27+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: Ã…ke Engelbrektson\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/jami/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -165,7 +165,7 @@ msgstr "Media"
 msgid "Account"
 msgstr "Konto"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -465,90 +465,102 @@ msgstr "­_Om"
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "System"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Starta programmet vid inloggning"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Visa Jami-ikon i aviseringsfältet (systray)"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Ta fram Jami till förgrunden vid inkommande samtal"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Aviseringar"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Aktivera avisering för inkommande samtal"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Aktivera avisering för väntande förfrågningar"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Aktivera avisering för nya chattmeddelanden"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Chattvy"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "Visa skrivindikering"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Visa bilder och filmer i chattfönstret"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "Visa chatten till höger (i underkant om av)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "Nerladdningsmapp"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Historik"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Spara historiken i (dagar, 0 = obegränsat)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Rensa all historik"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Samtalsinspelning"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Spela in lokal video"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Spela alltid in samtal"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Inspelningsmapp"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "Bithastighet för inspelningar (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Filöverföring"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "Information"
@@ -974,23 +986,23 @@ msgstr "Kan inte registrera namnet  (användarnamnet upptaget)."
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Kan inte registrera namnet (nätverksfel). Kontrollera din anslutning."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "Välj nerladdningsmapp"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Spara"
@@ -1211,90 +1223,90 @@ msgstr "Kontoexport misslyckades."
 msgid "Add account…"
 msgstr "Lägg till konto..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Placera samtal"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Öppna chatt"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - Migrering behövs"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "Migrering pågår... stäng inte detta fönster."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Hitta eller starta en konversation"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Lämna inställningssidan"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "Det finns aktiva samtal"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr " ringer dig!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "Ny förfrågan från"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Lita på begäran"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Vill du stoppa aktuellt samtal?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Det finns ett pågående samtal. Vill du stänga fönstret och stoppa alla aktuella samtal?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Rensa historik"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Vill du verkligen ta bort historiken för den här konversationen?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "Ta bort konversationen"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Vill du verkligen ta bort den här konversationen?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Blockera kontakt"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Vill du verkligen blockera den här kontakten?"
 
diff --git a/po/tr.po b/po/tr.po
index fbd2e5839609b5a03315b7e786ca762d33b8cc44..c2a6cee7ea9335903136b103665768b6c090fea1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,6 +7,7 @@
 # Altay dal <yestajoknu@enayu.com>, 2020
 # Caner BaÅŸaran <basaran.caner@protonmail.com>, 2016
 # Emin Tufan <etcetin@gmail.com>, 2016-2017
+# Hüseyin Güç <huseyinguc@outlook.com>, 2020
 # koray arberk <korayarberk@yahoo.com>, 2016
 # mahmut özcan <mahmutozcan@protonmail.com>, 2016,2019
 # M. Utkun Uyar, 2016
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-13 19:04+0000\n"
-"Last-Translator: mahmut özcan <mahmutozcan@protonmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/jami/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,17 +48,17 @@ msgstr "Arama çubuğunu seç"
 #: ui/help-overlay.ui:39
 msgctxt "shortcut window"
 msgid "Focus the list of conversations"
-msgstr ""
+msgstr "KonuÅŸma listesine odaklan"
 
 #: ui/help-overlay.ui:46
 msgctxt "shortcut window"
 msgid "Focus the list pending requests"
-msgstr ""
+msgstr "Bekleyen isteklere odaklan"
 
 #: ui/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Toggle fullscreen"
-msgstr ""
+msgstr "Tam ekrana geçin"
 
 #: ui/help-overlay.ui:63
 msgctxt "shortcut window"
@@ -152,7 +153,7 @@ msgstr "Sohbet görünümü"
 #: ui/help-overlay.ui:189
 msgctxt "shortcut window"
 msgid "Write on a new line"
-msgstr ""
+msgstr "Yeni bir satırda yazın"
 
 #: ui/mainwindow.ui:57
 msgid "Menu"
@@ -171,7 +172,7 @@ msgstr "Ortam"
 msgid "Account"
 msgstr "Hesap"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -223,7 +224,7 @@ msgstr "Hesap göçü"
 
 #: ui/accountmigrationview.ui:283
 msgid "Migrating your Jami account…"
-msgstr ""
+msgstr "Jami hesabınız taşınıyor..."
 
 #: ui/accountmigrationview.ui:295
 msgid "Migration failed, wrong password?"
@@ -243,7 +244,7 @@ msgstr "Katılımcı ekle"
 
 #: ui/currentcallview.ui:294
 msgid "Toggle transfer"
-msgstr ""
+msgstr "Aktarımı Aç/Kapat"
 
 #: ui/currentcallview.ui:313
 msgid "Toggle hold"
@@ -268,7 +269,7 @@ msgstr "Görüntüyü kapat"
 
 #: ui/currentcallview.ui:388
 msgid "Toggle recording"
-msgstr ""
+msgstr "Kayıt işlemini Aç/Kapat"
 
 #: ui/currentcallview.ui:391 ui/currentcallview.ui:529
 #: ui/messagingwidget.ui:29 src/chatview.cpp:348
@@ -285,7 +286,7 @@ msgstr "Görüntü kalitesi"
 
 #: ui/currentcallview.ui:436
 msgid "Toggle show chat"
-msgstr "Öntanımlı şifreyi kullan"
+msgstr "Sohbet Penceresini Aç/Kapat"
 
 #: ui/currentcallview.ui:440 ui/currentcallview.ui:457
 msgid "Chat"
@@ -317,7 +318,7 @@ msgstr "Yerel hesap oluÅŸtur"
 
 #: ui/accountcreationwizard.ui:77
 msgid "Create a new Jami account on this device (for new users)"
-msgstr ""
+msgstr "Bu cihaz üzerinde yeni bir Jami hesabı oluşturun\n(yeni kullanıcılar için)"
 
 #: ui/accountcreationwizard.ui:84 src/accountcreationwizard.cpp:591
 msgid "Import from device"
@@ -325,7 +326,7 @@ msgstr "cihazdan içe aktarın"
 
 #: ui/accountcreationwizard.ui:85
 msgid "Import an account with your PIN generated on another device"
-msgstr ""
+msgstr "Başka bir cihazda PIN ile oluşturulmuş\nhesabı içeriye aktarma"
 
 #: ui/accountcreationwizard.ui:92
 msgid "Import from archive backup"
@@ -333,7 +334,7 @@ msgstr "Arşiv yedeklemesinden içe aktar"
 
 #: ui/accountcreationwizard.ui:93
 msgid "Import an account via your archive"
-msgstr ""
+msgstr "Arşiviniz aracılığıyla bir hesabı içe aktarma"
 
 #: ui/accountcreationwizard.ui:100
 msgid "Advanced…"
@@ -345,7 +346,7 @@ msgstr "Hesap yöneticisine bağlan"
 
 #: ui/accountcreationwizard.ui:112
 msgid "Get your account via your credentials."
-msgstr ""
+msgstr "Hesabınızı kimlik bilgileriniz üzerinden alın."
 
 #: ui/accountcreationwizard.ui:119
 msgid "Add a new SIP account"
@@ -367,13 +368,13 @@ msgstr "PIN"
 msgid ""
 "You can obtain an archive by clicking on \"Export account\" in the account "
 "settings. This will create a .gz file on your device."
-msgstr ""
+msgstr "Hesap ayarlarında \"Hesabı dışa aktar\" ı tıklayarak bir arşiv dosyası üretebilirsiniz. Bu, cihazınızda bir .gz dosyası oluşturur."
 
 #: ui/accountcreationwizard.ui:382
 msgid ""
 "To obtain a PIN (valid for 10 minutes), you need to open the account "
 "settings on the other device and click on \"Link to another device\"."
-msgstr ""
+msgstr "PIN almak için (10 dakika geçerlidir), diğer cihazdaki hesap ayarlarını açmanız ve \"Başka bir cihaza bağla\" yı tıklamanız gerekir."
 
 #: ui/accountcreationwizard.ui:402 ui/accountcreationwizard.ui:703
 #: ui/accountcreationwizard.ui:1084
@@ -399,7 +400,7 @@ msgid ""
 "By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your ID, which is 40 "
 "characters long."
-msgstr ""
+msgstr "Bunu kontrol ederek, Jami ağına benzersiz bir kullanıcı adı ile kaydolacaksınız. Kullanıcılar, 40 karakter uzunluğundaki kimliğinizi kullanmak yerine sizinle iletişim kurmak için bu adı kullanabilir."
 
 #: ui/accountcreationwizard.ui:625
 msgid ""
@@ -457,7 +458,7 @@ msgstr "TAMAM"
 
 #: ui/accountcreationwizard.ui:938
 msgid "Sign in"
-msgstr ""
+msgstr "Oturum açın"
 
 #: ui/gearsmenu.ui:7
 msgid "Keyboard _Shortcuts"
@@ -471,88 +472,100 @@ msgstr "_Hakkında"
 msgid "_Quit"
 msgstr "_Çıkış"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Düzen"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "Uygulamayı girişte başlat"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Sistem tepsisinde Jami simgesini (sistem tepsisi) göster"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Gelen aramalarda Jami'yi ön plana çıkar."
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Gelen çağrılar için bildirimleri etkinleştir."
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "Bekleyen istekler için bildirimleri etkinleştir"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "Yeni söyleşi iletileri için bildirimleri etkinleştir"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "Sohbet görünümü"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
-msgstr ""
+msgstr "Yazım belirteçlerini göster"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "Sohbet görünümünde resimler ve videolar görüntüle"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
-msgstr ""
+msgstr "Sohbet görünümünü sağda göster (kapalıysa altta duracaktır)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "İndirme klasörü"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Geçmiş"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "Geçmişi tutulacak gün sayısı (gün 0 ise sınırsız)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Tüm geçmişi temizle"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "Çağrı kaydetme"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "Yerel video kaydet"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "Her zaman çağrıları kaydet"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "Kayıt klasörü"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
+msgstr "Çağrı kayıtları için bit hızı (kb / s)"
+
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
 msgstr ""
 
 #: ui/profile.ui:58
@@ -617,7 +630,7 @@ msgstr "Donanım Hızlandırma"
 
 #: ui/mediasettingsview.ui:282
 msgid "Enable hardware acceleration:"
-msgstr ""
+msgstr "Donanım hızlandırmayı etkinleştir:"
 
 #: ui/newaccountsettingsview.ui:15
 msgid "Add device"
@@ -868,23 +881,23 @@ msgstr "SDP Görüşme Oturumu (ICE Geri çekilme)"
 
 #: ui/newaccountsettingsview.ui:2730
 msgid "Only used during SDP negotiation in case ICE is not supported."
-msgstr ""
+msgstr "Yalnızca ICE'nin desteklenmemesi durumunda, SDP görüşmesi sırasında kullanılır."
 
 #: ui/newaccountsettingsview.ui:2764
 msgid "Audio RTP Min port"
-msgstr ""
+msgstr "Ses RTP Min bağlantı noktası"
 
 #: ui/newaccountsettingsview.ui:2799
 msgid "Audio RTP Max port"
-msgstr ""
+msgstr "Ses RTP Maks bağlantı noktası"
 
 #: ui/newaccountsettingsview.ui:2834
 msgid "Video RTP Min port"
-msgstr ""
+msgstr "Video RTP Min bağlantı noktası"
 
 #: ui/newaccountsettingsview.ui:2869
 msgid "Video RTP Max port"
-msgstr ""
+msgstr "Video RTP Max bağlantı noktası"
 
 #: ui/usernameregistrationbox.ui:28
 msgid "register username"
@@ -948,7 +961,7 @@ msgstr "Arama kullanılamıyor, ağ bağlantınızı kontrol edin"
 
 #: src/usernameregistrationbox.cpp:273
 msgid "Performing lookup…"
-msgstr ""
+msgstr "Arama yapılıyor…"
 
 #: src/usernameregistrationbox.cpp:324
 msgid "Enter the password of your Jami account"
@@ -966,11 +979,11 @@ msgstr "İsim kaydı hatası"
 msgid ""
 "Unable to register name (Invalid name). Your username should contains "
 "between 3 and 32 alphanumerics characters (or underscore)."
-msgstr ""
+msgstr "Adınız kaydedilemedi (Geçersiz ad). Kullanıcı adınız 3 ila 32 alfasayısal karakter (veya alt çizgi) içermelidir."
 
 #: src/usernameregistrationbox.cpp:438
 msgid "Unable to register name (Wrong password)."
-msgstr ""
+msgstr "İsim kaydedilemiyor (Yanlış şifre)."
 
 #: src/usernameregistrationbox.cpp:442
 msgid "Unable to register name (Username already taken)."
@@ -980,23 +993,23 @@ msgstr "Ad kaydedilemiyor (Kullanıcı adı zaten alındı). "
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "Ad kaydedilemiyor (ağ hatası) - bağlantınızı kontrol edin."
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 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:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "İndirme klasörünü seçin"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Ä°ptal"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "_Kaydet"
@@ -1041,7 +1054,7 @@ msgstr "Reddet"
 
 #: src/video/video_widget.cpp:558
 msgid "Share _screen area"
-msgstr ""
+msgstr "Ekranı paylaş"
 
 #: src/video/video_widget.cpp:566
 msgid "Share _monitor"
@@ -1073,7 +1086,7 @@ msgctxt "Do not translate the release name nor the status (beta, final, ...)"
 msgid ""
 "\"Free as in Freedom\"\n"
 "built on %.25s"
-msgstr ""
+msgstr "\"Özgürlükteki gibi ücretsiz\"\n%.25süzerine inşa ediliyor"
 
 #: src/dialogs.c:137
 msgid ""
@@ -1100,13 +1113,13 @@ msgstr "Jami Hatası"
 
 #: src/native/dbuserrorhandler.cpp:57
 msgid "Trying to reconnect to the Jami daemon (dring)…"
-msgstr ""
+msgstr "Jami uygulamasına yeniden bağlanmayı deniyor\n(dring)…"
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
 "Could not re-connect to the Jami daemon (dring).\n"
 "Jami will now quit."
-msgstr ""
+msgstr "Jami uygulamasına bağlanılamadı (dring).\nJami uygulamasından çıkılacak."
 
 #: src/client_options.c:66
 msgid "Enable debug"
@@ -1120,15 +1133,15 @@ msgstr "Ana pencerenin gizli durumunu eski haline döndürür (sadece birincil o
 
 #: src/client_options.c:85
 msgid "- GNOME client for Jami"
-msgstr ""
+msgstr "- Jami için GNOME istemcisi"
 
 #: src/conversationpopupmenu.cpp:199
 msgid "Place _video call"
-msgstr ""
+msgstr "Video görüşmesi yapın"
 
 #: src/conversationpopupmenu.cpp:202
 msgid "Place _audio call"
-msgstr ""
+msgstr "Sesli arama yapın"
 
 #: src/conversationpopupmenu.cpp:210
 msgid "_Add to conversations"
@@ -1172,17 +1185,17 @@ msgstr "Hesap oluÅŸturulurken bir hata meydana geldi."
 
 #: src/accountcreationwizard.cpp:293
 msgid "Cannot retrieve any account, please verify your PIN and your password."
-msgstr ""
+msgstr "Herhangi bir hesap alınamıyor, lütfen PIN'inizi ve şifrenizi doğrulayın."
 
 #: src/accountcreationwizard.cpp:297
 msgid ""
 "Cannot retrieve any account, please verify your archive and your password."
-msgstr ""
+msgstr "Herhangi bir hesap alınamıyor, lütfen arşivinizi ve şifrenizi doğrulayın."
 
 #: src/accountcreationwizard.cpp:301
 msgid ""
 "Cannot connect to provided account manager. Please check your credentials."
-msgstr ""
+msgstr "Sağlanan hesap yöneticisine bağlanılamıyor. Lütfen kimlik bilgilerinizi kontrol edin."
 
 #: src/accountcreationwizard.cpp:487
 msgid "Passwords don't match"
@@ -1217,90 +1230,90 @@ msgstr "Hesap dışa aktarımı başarısız."
 msgid "Add account…"
 msgstr "Hesap ekle..."
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "ara"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "konuşma aç"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
-msgstr ""
+msgstr "Jami - Taşıma gerekli"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
-msgstr ""
+msgstr "Taşıma devam ediyor ... lütfen bu pencereyi kapatmayın."
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "Bir konuÅŸma bul veya baÅŸlat"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "Ayarlar sayfasından ayrıl"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
-msgstr ""
+msgstr "Aktif aramalar var"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "seni arıyor!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Gelen arama"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
-msgstr ""
+msgstr "Adlı kişiden yeni istek"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "Güven isteği"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "Yeni ileti"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "Devam eden çağrıyı kapatmak istiyor musunuz?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "Bir çağrı şu anda devam ediyor. Pencereyi ve devam eden tüm çağrıları kapatmak istiyor musunuz?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Geçmişi temizle"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "Bu konuşmanın geçmişini gerçekten silmek istiyor musun?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "KonuÅŸma sil"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "Bu konuşmayı gerçekten silmek istiyor musun?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "KiÅŸiyi engelle"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "Bu kişiyi gerçekten engellemek istiyor musun?"
 
@@ -1326,7 +1339,7 @@ msgid ""
 "Unable to initialize.\n"
 "Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr ""
+msgstr "Başlatılamıyor.\nJami arka plan programının (dring) çalıştığından emin olun.\nHata:%s"
 
 #: src/client.cpp:118
 msgid "Jami Error"
@@ -1369,11 +1382,11 @@ msgstr "KendiliÄŸinden"
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
-msgstr ""
+msgstr "Uyarı! Bu işlem cihazı iptal edecektir!\nNot: bu işlem geri alınamaz."
 
 #: src/newaccountsettingsview.cpp:602
 msgid "Enter password to revoke device"
-msgstr ""
+msgstr "Cihazı iptal etmek için şifre girin"
 
 #: src/newaccountsettingsview.cpp:660
 msgid "Edit name"
@@ -1385,7 +1398,7 @@ msgstr "Aygıtı feshet "
 
 #: src/newaccountsettingsview.cpp:682
 msgid "Error when revoking device"
-msgstr ""
+msgstr "Cihaz iptal edilirken hata oluÅŸtu"
 
 #: src/newaccountsettingsview.cpp:755
 msgid "Unban"
@@ -1398,7 +1411,7 @@ msgstr "Parolayı değiştir"
 
 #: src/newaccountsettingsview.cpp:791
 msgid "New password and its confirmation are different!"
-msgstr ""
+msgstr "GirdiÄŸiniz ÅŸifreler uyuÅŸmuyor!"
 
 #: src/newaccountsettingsview.cpp:802
 msgid "Incorrect password!"
@@ -1406,7 +1419,7 @@ msgstr "Yanlış parola!"
 
 #: src/newaccountsettingsview.cpp:839
 msgid "Note: this will change the password only on this device."
-msgstr ""
+msgstr "Not: bu işlem yalnızca bu cihazda şifreyi değiştirir."
 
 #: src/newaccountsettingsview.cpp:842
 msgid "Current password"
diff --git a/po/uk.po b/po/uk.po
index 07e830edc57f5a2977c2b063009d7a15821aeb60..87525f43863ea9874376271ef95a6d5c82c95854 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
-"Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: patriotyk <patriotyk@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/jami/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -172,7 +172,7 @@ msgstr "Медіа"
 msgid "Account"
 msgstr "Аккаунт"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -472,90 +472,102 @@ msgstr "_Про програму"
 msgid "_Quit"
 msgstr "_Вихід"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "Система"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "Показувати значок Джамі в системній панелі"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "Переводити Джамі на передній план при вхідному дзвінку"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "Увімкнути сповіщення для вхідних дзвінків"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "Історія"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "Очистити усю історію"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "Передача файлів"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -981,23 +993,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "Це руйнівна дія. Упевнені, що хочете видалити всі ваші листування та історію дзвінків?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1218,90 +1230,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "розпочати дзвінок"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "відкрити розмову"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "Вхідний дзвінок"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "Видалити історію"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "Заблокувати контакт"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index 8b6022a9699cbd752c2d30eb770e7bccd264977d..4fd6f6d6383c279020e7bcaab57b86feeb27b72b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-16 07:09+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: savoirfairelinux <support@savoirfairelinux.com>\n"
 "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/jami/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "媒體"
 msgid "Account"
 msgstr "帳號"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "設定"
 
@@ -467,90 +467,102 @@ msgstr "_關於"
 msgid "_Quit"
 msgstr "_離開"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr ""
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr ""
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
 msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr ""
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr ""
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr ""
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr ""
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "歷史記錄"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr ""
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "清除所有歷史紀錄"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr ""
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr ""
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr ""
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr ""
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr ""
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr ""
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr ""
@@ -976,23 +988,23 @@ msgstr ""
 msgid "Unable to register name (Network error) - check your connection."
 msgstr ""
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr ""
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr ""
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr ""
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr ""
@@ -1213,90 +1225,90 @@ msgstr ""
 msgid "Add account…"
 msgstr ""
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr ""
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr ""
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr ""
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr ""
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr ""
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "來電"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr ""
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr ""
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr ""
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr ""
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr ""
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr ""
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr ""
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr ""
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr ""
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d8ccd9f80a49504f9e0f01189193879e79b3939..676c2d5636ab18bdf7ef82180eb6b0f672d007a0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-04-18 15:15+0000\n"
-"Last-Translator: Shuisi Liu <forevoliu@gmail.com>\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
+"Last-Translator: StandAlong <ingramyang@163.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/jami/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +171,7 @@ msgstr "媒体"
 msgid "Account"
 msgstr "帐户"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "设置"
 
@@ -471,90 +471,102 @@ msgstr "关于(_A)"
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "系统"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "登录时启动应用"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "在系统托盘区域中显示Jami图标(系统托盘)"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "来电时将Jami切换到前台"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "通知"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "启用来电通知"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "启用待处理请求通知"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "启用新消息通知"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "聊天界面"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "显示打字状态"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "在聊天界面中显示图片和视频"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "在右侧显示聊天界面。(若关闭则显示于下方)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "下载文件夹"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "历史记录"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "历史记录保存(天数,0=无限制):"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "清除所有历史记录"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "通话录音"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "录制本地视频"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "总是录音通话"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "录制文件夹"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "通话录音比特率(kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "文件传输"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "信息"
@@ -980,23 +992,23 @@ msgstr "无法注册名称(用户名已被占用)。"
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "无法注册名称(网络错误) - 检查您的连接。"
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "该操作不可撤销。确定删除您的所有聊天与通话记录吗?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "选择下载文件夹"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "保存(_S)"
@@ -1217,90 +1229,90 @@ msgstr "导出帐户失败。"
 msgid "Add account…"
 msgstr "添加帐户…"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "拨出"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "发起聊天"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - 需迁移"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "正在进行迁移...请勿关闭此窗口。"
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "查找或开始会话"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "离开设置页"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "有进行中的通话"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "正在呼叫您!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "来电"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "新请求来自"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "信任请求"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "新消息"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "停止当前通话吗?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "当前有通话正在进行。您要关闭窗口并停止当前所有通话吗?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "清除历史记录"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "您真的要清除此会话的历史记录吗?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "移除会话"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "您真的要删除此会话吗?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "屏蔽联系人"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "您真的要屏蔽此联系人吗?"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e154dcc4e52e5b587fa472707d89f3013c4f8399..0dedd809dbf136f37a7744b8deb104183043ff47 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jami\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-27 03:09-0400\n"
-"PO-Revision-Date: 2020-03-17 02:20+0000\n"
+"POT-Creation-Date: 2020-05-04 03:09-0400\n"
+"PO-Revision-Date: 2020-05-04 07:09+0000\n"
 "Last-Translator: 黃柏諺 <s8321414@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/jami/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -168,7 +168,7 @@ msgstr "媒體"
 msgid "Account"
 msgstr "帳號"
 
-#: ui/mainwindow.ui:150 src/mainwindow.cpp:1845
+#: ui/mainwindow.ui:150 src/mainwindow.cpp:1840
 msgid "Settings"
 msgstr "設定"
 
@@ -468,90 +468,102 @@ msgstr "關於(_A)"
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ui/generalsettingsview.ui:51
+#: ui/generalsettingsview.ui:58
 msgid "System"
 msgstr "系統"
 
-#: ui/generalsettingsview.ui:89
+#: ui/generalsettingsview.ui:96
 msgid "Start application on login"
 msgstr "在登入時啟動應用程式"
 
-#: ui/generalsettingsview.ui:125
-msgid "Show Jami icon (systray) in the systray area"
-msgstr "在系統匣區域中顯示 Jami 圖示(系統匣)。"
+#: ui/generalsettingsview.ui:132
+msgid "Keep Jami active when window is closed."
+msgstr ""
 
-#: ui/generalsettingsview.ui:161
+#: ui/generalsettingsview.ui:168
 msgid "Bring Jami to the foreground on incoming calls"
 msgstr "有來電時將 Jami 帶到前景"
 
-#: ui/generalsettingsview.ui:197
+#: ui/generalsettingsview.ui:204
 msgid "Notifications"
 msgstr "通知"
 
-#: ui/generalsettingsview.ui:236
+#: ui/generalsettingsview.ui:243
 msgid "Enable notifications for incoming calls"
 msgstr "啟用來電通知"
 
-#: ui/generalsettingsview.ui:272
+#: ui/generalsettingsview.ui:279
 msgid "Enable notifications for pending requests"
 msgstr "啟用擱置中請求的通知"
 
-#: ui/generalsettingsview.ui:308
+#: ui/generalsettingsview.ui:315
 msgid "Enable notifications for new chat messages"
 msgstr "啟用新聊天訊息通知"
 
-#: ui/generalsettingsview.ui:344
+#: ui/generalsettingsview.ui:351
 msgid "Chatview"
 msgstr "聊天視窗"
 
-#: ui/generalsettingsview.ui:383
+#: ui/generalsettingsview.ui:390
 msgid "Show typing indications"
 msgstr "顯示打字指示"
 
-#: ui/generalsettingsview.ui:419
+#: ui/generalsettingsview.ui:426
 msgid "Display images and videos into the chatview"
 msgstr "在聊天室窗中顯示圖片與影片"
 
-#: ui/generalsettingsview.ui:456
+#: ui/generalsettingsview.ui:463
 msgid "Show chatview on the right (on the bottom if off)"
 msgstr "將聊天視窗顯示在右邊(如果關閉的話就是在底部)"
 
-#: ui/generalsettingsview.ui:493
+#: ui/generalsettingsview.ui:500
 msgid "Download folder"
 msgstr "下載資料夾"
 
-#: ui/generalsettingsview.ui:530
+#: ui/generalsettingsview.ui:537
 msgid "History"
 msgstr "歷史記錄"
 
-#: ui/generalsettingsview.ui:569
+#: ui/generalsettingsview.ui:576
 msgid "Keep history for (days, 0 = unlimited)"
 msgstr "保留歷史(單位為天,0 = 無限制)"
 
-#: ui/generalsettingsview.ui:599
+#: ui/generalsettingsview.ui:606
 msgid "Clear all history"
 msgstr "清除所有記錄"
 
-#: ui/generalsettingsview.ui:631
+#: ui/generalsettingsview.ui:638
 msgid "Call Recording"
 msgstr "通話錄音"
 
-#: ui/generalsettingsview.ui:669
+#: ui/generalsettingsview.ui:676
 msgid "Record local video"
 msgstr "錄製本機視訊"
 
-#: ui/generalsettingsview.ui:705
+#: ui/generalsettingsview.ui:712
 msgid "Always record calls"
 msgstr "永遠記錄通話"
 
-#: ui/generalsettingsview.ui:742
+#: ui/generalsettingsview.ui:749
 msgid "Record folder"
 msgstr "紀錄資料夾"
 
-#: ui/generalsettingsview.ui:779
+#: ui/generalsettingsview.ui:786
 msgid "Bitrate for call recordings (kb/s)"
 msgstr "通話記錄的位元率 (kb/s)"
 
+#: ui/generalsettingsview.ui:824
+msgid "File transfer"
+msgstr "檔案傳輸"
+
+#: ui/generalsettingsview.ui:862
+msgid "Accept from untrusted contacts"
+msgstr ""
+
+#: ui/generalsettingsview.ui:899
+msgid "Accept transfer behind (Mb, 0 = unlimited)"
+msgstr ""
+
 #: ui/profile.ui:58
 msgid "Informations"
 msgstr "資訊"
@@ -977,23 +989,23 @@ msgstr "無法註冊名稱(使用者名稱已使用)。"
 msgid "Unable to register name (Network error) - check your connection."
 msgstr "無法註冊名稱(網路錯誤),請檢查您的連線。"
 
-#: src/generalsettingsview.cpp:152
+#: src/generalsettingsview.cpp:161
 msgid ""
 "This is a destructive operation. Are you sure you want to delete all of your"
 " chat and call history?"
 msgstr "這是一個破壞性的操作。您確定您想要刪除您所有的聊天與通話紀錄嗎?"
 
-#: src/generalsettingsview.cpp:222
+#: src/generalsettingsview.cpp:231
 msgid "Choose download folder"
 msgstr "選擇下載資料夾"
 
-#: src/generalsettingsview.cpp:225 src/avatarmanipulation.cpp:414
+#: src/generalsettingsview.cpp:234 src/avatarmanipulation.cpp:414
 #: src/accountcreationwizard.cpp:757 src/chatview.cpp:284
 #: src/newaccountsettingsview.cpp:907
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/generalsettingsview.cpp:227 src/accountcreationwizard.cpp:759
+#: src/generalsettingsview.cpp:236 src/accountcreationwizard.cpp:759
 #: src/chatview.cpp:286 src/newaccountsettingsview.cpp:909
 msgid "_Save"
 msgstr "儲存(_S)"
@@ -1214,90 +1226,90 @@ msgstr "匯出帳號失敗。"
 msgid "Add account…"
 msgstr "新增帳號……"
 
-#: src/mainwindow.cpp:847
+#: src/mainwindow.cpp:846
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "開始通話"
 
-#: src/mainwindow.cpp:850
+#: src/mainwindow.cpp:849
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "開啟聊天"
 
-#: src/mainwindow.cpp:1057
+#: src/mainwindow.cpp:1056
 msgid "Jami - Migration needed"
 msgstr "Jami - 需要遷移"
 
-#: src/mainwindow.cpp:1070
+#: src/mainwindow.cpp:1069
 msgid "Migration in progress... please do not close this window."
 msgstr "正在遷移…… 請不要關閉視窗。"
 
-#: src/mainwindow.cpp:1349
+#: src/mainwindow.cpp:1344
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Find or start a conversation"
 msgstr "尋找或開始對話"
 
-#: src/mainwindow.cpp:1820
+#: src/mainwindow.cpp:1815
 msgid "Leave settings page"
 msgstr "離開設定頁面"
 
-#: src/mainwindow.cpp:2246
+#: src/mainwindow.cpp:2241
 msgid "There are active calls"
 msgstr "有活躍的通話"
 
-#: src/mainwindow.cpp:2298
+#: src/mainwindow.cpp:2293
 msgid " is calling you!"
 msgstr "正在與您通話!"
 
-#: src/mainwindow.cpp:2301
+#: src/mainwindow.cpp:2296
 msgid "Incoming call"
 msgstr "來電"
 
-#: src/mainwindow.cpp:2443
+#: src/mainwindow.cpp:2438
 msgid "New request from "
 msgstr "新請求從"
 
-#: src/mainwindow.cpp:2446
+#: src/mainwindow.cpp:2441
 msgid "Trust request"
 msgstr "信任請求"
 
-#: src/mainwindow.cpp:2509
+#: src/mainwindow.cpp:2504
 msgid "New message"
 msgstr "新訊息"
 
-#: src/mainwindow.cpp:2572
+#: src/mainwindow.cpp:2567
 msgid "Stop current call?"
 msgstr "停止目前的通話?"
 
-#: src/mainwindow.cpp:2573
+#: src/mainwindow.cpp:2568
 msgid ""
 "A call is currently ongoing. Do you want to close the window and stop all "
 "current calls?"
 msgstr "通話進行中。您想要關閉視窗並停止目前所有的通話嗎?"
 
-#: src/mainwindow.cpp:2640
+#: src/mainwindow.cpp:2635
 msgid "Clear history"
 msgstr "清除記錄"
 
-#: src/mainwindow.cpp:2641
+#: src/mainwindow.cpp:2636
 msgid "Do you really want to clear the history of this conversation?"
 msgstr "您真的想要清除此對話的歷史嗎?"
 
-#: src/mainwindow.cpp:2656
+#: src/mainwindow.cpp:2651
 msgid "Remove conversation"
 msgstr "移除對話"
 
-#: src/mainwindow.cpp:2657
+#: src/mainwindow.cpp:2652
 msgid "Do you really want to remove this conversation?"
 msgstr "您真的想要移除此對話嗎?"
 
-#: src/mainwindow.cpp:2672
+#: src/mainwindow.cpp:2667
 msgid "Block contact"
 msgstr "阻擋連絡人"
 
-#: src/mainwindow.cpp:2673
+#: src/mainwindow.cpp:2668
 msgid "Do you really want to block this contact?"
 msgstr "您真的想要封鎖此聯絡人嗎?"