Update translations

31 files changed, 7533 insertions, 6233 deletions

diff --git a/main/po/LINGUAS b/main/po/LINGUAS
index be49318e..9de5c5f6 100644
--- a/main/po/LINGUAS
+++ b/main/po/LINGUAS
@@ -9,9 +9,11 @@ fi
 fr
 gl
 hu
+ie
 it
 ja
 lb
+lt
 nb
 nl
 nl_BE
@@ -21,8 +23,6 @@ pt_BR
 ro
 ru
 sv
+tr
 zh_CN
 zh_TW
-tr
-lt
-ie
diff --git a/main/po/ar.po b/main/po/ar.po
index f476d1d0..d05e7f07 100644
--- a/main/po/ar.po
+++ b/main/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-12 13:21+0000\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/translations/"
 "ar/>\n"
@@ -19,23 +19,213 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 3.10.1\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "مرحبا بكم على دينو!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "إتّصل أو قم بإنشاء حساب للمواصلة."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "تهيئة الحساب"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "ليس هناك أية حسابات نشطة"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "إدارة الحسابات"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "ليس هناك أية محادثات نشطة"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "الشروع في محادثة"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "الإلتحاق بقناة"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "اليوم"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "البارحة"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "جارٍ تنزيل %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "عرض عليك %s: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "الملف المقدّم: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "تم تقديم الملف"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "فشل نقل الملف"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "الرسالة طويلة جدًا"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "قبول"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "رفض"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "يريد هذا المراسل إضافتك إلى قائمة مراسليه"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "غير مشفّرة"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "منذ دقيقة"
+msgstr[1] "منذ %i د"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %i د"
+msgstr[4] "منذ %i دقائق"
+msgstr[5] "منذ %i دقيقة"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "الآن"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "تم إرسال الصورة"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "تم إرسال الملف"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "تم استلام الصورة"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "تم استلام الملف"
 
@@ -43,16 +233,6 @@ msgstr "تم استلام الملف"
 msgid "Subscription request"
 msgstr "طلب اشتراك"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "قبول"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "رفض"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +271,7 @@ msgstr "اختيار"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +321,8 @@ msgstr "الإتصال بـ %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "بإمكانك الآن الشروع في استخدام %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +354,8 @@ msgid "The server requires to sign up through a website"
 msgstr "يتطلب الخادم التسجيل من خلال موقع ويب"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "التسجيلات مفتوحة"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,59 +366,12 @@ msgstr "إنشاء حساب"
 msgid "Check %s for information on how to sign up"
 msgstr "إطّلع على %s للمزيد من المعلومات حول التسجيل"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "أنا"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "البارحة"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "منذ دقيقة"
-msgstr[1] "منذ %i د"
-msgstr[2] "منذ دقيقتين"
-msgstr[3] "منذ %i د"
-msgstr[4] "منذ %i دقائق"
-msgstr[5] "منذ %i دقيقة"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "الآن"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "الإلتحاق بقناة"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -245,20 +379,16 @@ msgstr "الإلتحاق بقناة"
 msgid "Join"
 msgstr "إنضمّ"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s مِن %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "إضافة"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "حفظ"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -273,14 +403,6 @@ msgstr "التالي"
 msgid "Back"
 msgstr "العودة"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "الشروع في محادثة"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "إبدأ"
@@ -317,128 +439,6 @@ msgstr "إختر إسما مستعارا آخر"
 msgid "Too many occupants in room"
 msgstr "غرفة المحادثة مكتضة"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "مرحبا بكم على دينو!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "إتّصل أو قم بإنشاء حساب للمواصلة."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "تهيئة الحساب"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "ليس هناك أية حسابات نشطة"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "إدارة الحسابات"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "ليس هناك أية محادثات نشطة"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "جارٍ تنزيل %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "عرض عليك %s: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "الملف المقدّم: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "تم تقديم الملف"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "فشل نقل الملف"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "اليوم"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s و %s و %i آخَرين"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s و %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s و %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "يكتب…"
-msgstr[1] "يكتب…"
-msgstr[2] "يكتُبان…"
-msgstr[3] "يكتبون…"
-msgstr[4] "يكتبون…"
-msgstr[5] "يكتبون…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "توقفَ عن الكتابة"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "الرسالة طويلة جدًا"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "يريد هذا المراسل إضافتك إلى قائمة مراسليه"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "المالك"
@@ -474,8 +474,14 @@ msgstr "طرد"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i نتيجة بحث"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -521,12 +527,12 @@ msgid "Occupants may change the subject"
 msgstr "يمكن للمقيمين تغيير الموضوع"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "استكشاف مُعرّفي JID الحقيقيين"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "من يمكنهم استكشاف مُعرّفي JID الحقيقيين؟"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -537,8 +543,8 @@ msgid "Password"
 msgstr "كلمة السر"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "مطلوب كلمة السر لدخول الغرفة، إن وُجِدت"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -631,6 +637,10 @@ msgstr "البحث عن رسائل"
 msgid "Members"
 msgstr "الأعضاء"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "الإشعار عند تلقي رسائل جديدة"
@@ -696,10 +706,6 @@ msgstr "لقد أعددت كل شيء!"
 msgid "Finish"
 msgstr "أنهي"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "غير مشفّرة"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "ختصارات لوحة المفاتيح"
@@ -796,10 +802,57 @@ msgstr "تحقق مِن التدقيق الإملائي أو حاول إزالة
 msgid "Click here to start a conversation or join a channel."
 msgstr "اضغط هنا لبداية المحادثة أو للإنضمام إلى قناة."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "ليس لديك أية محادثة مفتوحة"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s و %s و %i آخَرين"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "بإمكانك الآن الشروع في استخدام %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "التسجيلات مفتوحة"
+
+#~ msgid "Save"
+#~ msgstr "حفظ"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s و %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s و %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "يكتب…"
+#~ msgstr[1] "يكتب…"
+#~ msgstr[2] "يكتُبان…"
+#~ msgstr[3] "يكتبون…"
+#~ msgstr[4] "يكتبون…"
+#~ msgstr[5] "يكتبون…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "توقفَ عن الكتابة"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i نتيجة بحث"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "استكشاف مُعرّفي JID الحقيقيين"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "من يمكنهم استكشاف مُعرّفي JID الحقيقيين؟"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "مطلوب كلمة السر لدخول الغرفة، إن وُجِدت"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "فشل الاتصال بـ %s"
 
diff --git a/main/po/ca.po b/main/po/ca.po
index cb8f4d50..68ac044e 100644
--- a/main/po/ca.po
+++ b/main/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino 20180510\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-16 00:21+0000\n"
 "Language-Team: Catalan; Valencian <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -16,23 +16,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Us donem la benvinguda al Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Entreu o creeu un compte per a començar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configureu un compte"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "No hi ha cap compte actiu"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gestiona els comptes"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Cap conversa activa"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Inicia una conversa"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Uneix-m'hi al canal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Avui"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ahir"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "S'està baixant %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ha oferit: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fitxer oferit: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fitxer oferit"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Ha fallat la transferència del fitxer"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "El missatge és massa llarg"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Acepta"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Rebutja"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Aquest contacte vol afegir-vos a la seva llista de contactes"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Sense xifrar"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H.%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l.%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H.%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l.%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H.%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l.%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H.%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l.%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fa %i minut"
+msgstr[1] "fa %i minuts"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Ara mateix"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imatge enviada"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fitxer enviat"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imatge rebuda"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fitxer rebut"
 
@@ -40,16 +226,6 @@ msgstr "Fitxer rebut"
 msgid "Subscription request"
 msgstr "Petició de subscripció"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Acepta"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Rebutja"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -88,6 +264,7 @@ msgstr "Selecciona"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -137,8 +314,8 @@ msgstr "Entra a %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Ara podeu començar a emprar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -170,8 +347,8 @@ msgid "The server requires to sign up through a website"
 msgstr "El servidor requereix un registre a través d'una pàgina web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Registre obert"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -182,55 +359,12 @@ msgstr "Registre"
 msgid "Check %s for information on how to sign up"
 msgstr "Mireu %s per obtenir informació sobre com registrar-vos"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Jo"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ahir"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H.%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l.%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "fa %i minut"
-msgstr[1] "fa %i minuts"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Ara mateix"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Uneix-m'hi al canal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -238,20 +372,16 @@ msgstr "Uneix-m'hi al canal"
 msgid "Join"
 msgstr "Uneix-te"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Afegeix"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Desa"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -266,14 +396,6 @@ msgstr "Següent"
 msgid "Back"
 msgstr "Enrere"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Inicia una conversa"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Inicia"
@@ -310,124 +432,6 @@ msgstr "Seleccioneu un sobrenom diferent"
 msgid "Too many occupants in room"
 msgstr "Massa ocupants a la sala"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Us donem la benvinguda al Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Entreu o creeu un compte per a començar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configureu un compte"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "No hi ha cap compte actiu"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gestiona els comptes"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Cap conversa activa"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "S'està baixant %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ha oferit: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fitxer oferit: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fitxer oferit"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Ha fallat la transferència del fitxer"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Avui"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s i %i altres"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s i %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s i %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "està escrivint…"
-msgstr[1] "estan escrivint…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "ha parat d'escriure"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "El missatge és massa llarg"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Aquest contacte vol afegir-vos a la seva llista de contactes"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H.%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l.%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H.%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l.%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H.%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l.%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Propietari"
@@ -463,8 +467,10 @@ msgstr "Expulsa"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i resultats de cerca"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -510,12 +516,12 @@ msgid "Occupants may change the subject"
 msgstr "Els ocupants poden canviar el tema"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descobreix els JID reals"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Qui pot descobrir els JID reals?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -526,8 +532,8 @@ msgid "Password"
 msgstr "Contrasenya"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "La contrasenya requerida per entrar a la sala, si cal"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -621,6 +627,10 @@ msgstr "Cerca els missatges"
 msgid "Members"
 msgstr "Membres"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifica'm quan arriba un missatge nou"
@@ -686,10 +696,6 @@ msgstr "Tot llest!"
 msgid "Finish"
 msgstr "Finalitza"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Sense xifrar"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
@@ -790,10 +796,53 @@ msgstr "Comproveu l'ortografia o proveu de suprimir filtres"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Feu clic aquí per a començar una conversa o unir-vos a un canal."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "No teniu cap xat obert"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s i %i altres"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Ara podeu començar a emprar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Registre obert"
+
+#~ msgid "Save"
+#~ msgstr "Desa"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s i %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s i %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "està escrivint…"
+#~ msgstr[1] "estan escrivint…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "ha parat d'escriure"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i resultats de cerca"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descobreix els JID reals"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Qui pot descobrir els JID reals?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "La contrasenya requerida per entrar a la sala, si cal"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "No s'ha pogut connectar a %s"
 
diff --git a/main/po/de.po b/main/po/de.po
index 4c81274a..ad1b7370 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-26 23:21+0000\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
 "de/>\n"
@@ -13,23 +13,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Willkommen bei Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Melde dich an oder erstelle ein Konto, um loszulegen."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Konto einrichten"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Keine Konten aktiv"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Konten verwalten"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Keine Unterhaltung aktiv"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Unterhaltung starten"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanal beitreten"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Heute"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Gestern"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d. %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Lade %s herunter…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s angeboten: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Datei angeboten: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Datei angeboten"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Dateiübertragung fehlgeschlagen"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Nachricht zu lang"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Annehmen"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Ablehnen"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Dieser Kontakt will dich zu seiner Kontaktliste hinzufügen"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Unverschlüsselt"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d. %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d. %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "vor %i min"
+msgstr[1] "vor %i min"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Gerade eben"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Bild gesendet"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Datei gesendet"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Bild empfangen"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Datei empfangen"
 
@@ -37,16 +223,6 @@ msgstr "Datei empfangen"
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Annehmen"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Ablehnen"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -85,6 +261,7 @@ msgstr "Auswählen"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -134,8 +311,8 @@ msgstr "Bei %s einloggen"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Du kannst %s ab jetzt nutzen"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -167,8 +344,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Der Server erfordert die Registrierung durch eine Webseite"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Registrierung öffnen"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -179,55 +356,12 @@ msgstr "Registrieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Eventuell sind auf %s Informationen zur Registrierung zu finden"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ich"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d. %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Gestern"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "vor %i min"
-msgstr[1] "vor %i min"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Gerade eben"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Kanal beitreten"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -235,20 +369,16 @@ msgstr "Kanal beitreten"
 msgid "Join"
 msgstr "Beitreten"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s aus %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Speichern"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -263,14 +393,6 @@ msgstr "Weiter"
 msgid "Back"
 msgstr "Zurück"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Unterhaltung starten"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Starten"
@@ -307,124 +429,6 @@ msgstr "Wähle einen anderen Spitznamen"
 msgid "Too many occupants in room"
 msgstr "Zu viele Nutzer im Raum"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Willkommen bei Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Melde dich an oder erstelle ein Konto, um loszulegen."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Konto einrichten"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Keine Konten aktiv"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Konten verwalten"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Keine Unterhaltung aktiv"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Lade %s herunter…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s angeboten: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Datei angeboten: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Datei angeboten"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Dateiübertragung fehlgeschlagen"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Heute"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s und %i weitere"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s und %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s und %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "tippt gerade…"
-msgstr[1] "tippen gerade…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "hat aufgehört zu tippen"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Nachricht zu lang"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Dieser Kontakt will dich zu seiner Kontaktliste hinzufügen"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d. %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d. %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Eigentümer"
@@ -460,8 +464,10 @@ msgstr "Hinauswerfen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i Suchergebnisse"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -508,12 +514,12 @@ msgid "Occupants may change the subject"
 msgstr "Nutzer können das Thema ändern"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Echte JIDs finden"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Wer kann echte JIDs sehen?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -524,8 +530,8 @@ msgid "Password"
 msgstr "Passwort"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Passwort zum Betreten des Raums, falls gesetzt"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -619,6 +625,10 @@ msgstr "Nachrichten suchen"
 msgid "Members"
 msgstr "Mitglieder"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
@@ -684,10 +694,6 @@ msgstr "Fertig!"
 msgid "Finish"
 msgstr "Fertig"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Unverschlüsselt"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Tastenkombinationen"
@@ -789,10 +795,53 @@ msgid "Click here to start a conversation or join a channel."
 msgstr ""
 "Klicke hier, um eine Unterhaltung zu starten oder einem Kanal beizutreten."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Du hast keine offenen Chats"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s und %i weitere"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Du kannst %s ab jetzt nutzen"
+
+#~ msgid "Open Registration"
+#~ msgstr "Registrierung öffnen"
+
+#~ msgid "Save"
+#~ msgstr "Speichern"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s und %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s und %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "tippt gerade…"
+#~ msgstr[1] "tippen gerade…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "hat aufgehört zu tippen"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i Suchergebnisse"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Echte JIDs finden"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Wer kann echte JIDs sehen?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Passwort zum Betreten des Raums, falls gesetzt"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Verbindung zu %s fehlgeschlagen"
 
diff --git a/main/po/dino.pot b/main/po/dino.pot
index 59f0cd60..c080efbe 100644
--- a/main/po/dino.pot
+++ b/main/po/dino.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\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"
@@ -18,23 +18,209 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr ""
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr ""
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr ""
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr ""
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr ""
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr ""
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr ""
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr ""
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr ""
 
@@ -42,16 +228,6 @@ msgstr ""
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr ""
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr ""
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr ""
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,7 +316,7 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
+msgid "You can now start using the account %s"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
@@ -172,7 +349,7 @@ msgid "The server requires to sign up through a website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
+msgid "Open website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
@@ -184,55 +361,12 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr ""
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr ""
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr ""
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
@@ -312,124 +434,6 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] ""
-msgstr[1] ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr ""
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr ""
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr ""
@@ -465,8 +469,10 @@ msgstr ""
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,11 +518,11 @@ msgid "Occupants may change the subject"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
+msgid "Permission to view JIDs"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
+msgid "Who is allowed to view the occupants' JIDs?"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
@@ -528,7 +534,7 @@ msgid "Password"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
@@ -622,6 +628,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
@@ -687,10 +697,6 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr ""
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -783,6 +789,6 @@ msgstr ""
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
diff --git a/main/po/en.po b/main/po/en.po
index 6277eed5..31ca3198 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,29 +2,215 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr ""
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr ""
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr ""
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr ""
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr ""
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr ""
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr ""
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr ""
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr ""
 
@@ -32,16 +218,6 @@ msgstr ""
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr ""
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr ""
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -80,6 +256,7 @@ msgstr ""
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -129,7 +306,7 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
+msgid "You can now start using the account %s"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
@@ -162,7 +339,7 @@ msgid "The server requires to sign up through a website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
+msgid "Open website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
@@ -174,55 +351,12 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr ""
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr ""
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -230,20 +364,16 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr ""
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -258,14 +388,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
@@ -302,124 +424,6 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] ""
-msgstr[1] ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr ""
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr ""
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr ""
@@ -455,8 +459,10 @@ msgstr ""
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -502,11 +508,11 @@ msgid "Occupants may change the subject"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
+msgid "Permission to view JIDs"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
+msgid "Who is allowed to view the occupants' JIDs?"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
@@ -518,7 +524,7 @@ msgid "Password"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
@@ -612,6 +618,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
@@ -677,10 +687,6 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr ""
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -773,6 +779,6 @@ msgstr ""
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index 537289e4..f9a042fb 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-01 15:50+0000\n"
-"Last-Translator: Kinsey Favre <kinseytamsin@tutanota.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
 "translations/eo/>\n"
 "Language: eo\n"
@@ -19,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Bonvenon al Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Ensalutu aŭ kreu konton por komenci."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Agordi konton"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Neniuj aktivaj kontoj"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Administri kontojn"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Neniu aktiva interparolo"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Komenci Konversacion"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Aliĝi al babilejo"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Hieraŭ"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d-a %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Elŝutado de %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ofertis: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Dosiero ofertita: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Dosiero ofertita"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Dosiertransigo malsukcesis"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mesaĝo tro longa"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Akcepti"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ĉi tiu kontakto ŝatus aligi vin al sia kontaktlisto"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Neĉifrita"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d-a %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d-a %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Antaŭ %i minuto"
+msgstr[1] "Antaŭ %i minutoj"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Ĵus"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Bildon sendis"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Dosieron sendis"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Bildon ricevis"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Dosieron ricevis"
 
@@ -43,16 +228,6 @@ msgstr "Dosieron ricevis"
 msgid "Subscription request"
 msgstr "Abona peto"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Akcepti"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Rifuzi"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +266,7 @@ msgstr "Elekti"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +316,8 @@ msgstr "Signo en al %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Vi nun povas komenci uzanta %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Malfermi registriĝon"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,55 +361,12 @@ msgstr "Registriĝi"
 msgid "Check %s for information on how to sign up"
 msgstr "Rigardi %s por informo pri kiel registriĝi"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Mi"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Hieraŭ"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "Antaŭ %i minuto"
-msgstr[1] "Antaŭ %i minutoj"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Ĵus"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Aliĝi al babilejo"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -241,20 +374,16 @@ msgstr "Aliĝi al babilejo"
 msgid "Join"
 msgstr "Aliĝi"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s el %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Aldoni"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Konservi"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -269,14 +398,6 @@ msgstr "Sekva"
 msgid "Back"
 msgstr "Retre"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Komenci Konversacion"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Komenci"
@@ -313,124 +434,6 @@ msgstr "Elektu malsaman kromnomon"
 msgid "Too many occupants in room"
 msgstr "Tro da okupantoj en babilejo"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Bonvenon al Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Ensalutu aŭ kreu konton por komenci."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Agordi konton"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Neniuj aktivaj kontoj"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Administri kontojn"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Neniu aktiva interparolo"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Elŝutado de %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ofertis: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Dosiero ofertita: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Dosiero ofertita"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Dosiertransigo malsukcesis"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Hodiaŭ"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d-a %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s, kaj %i aliaj"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s kaj %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s kaj %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "tajpas…"
-msgstr[1] "tajpas…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "ĉesis tajpi"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mesaĝo tro longa"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Ĉi tiu kontakto ŝatus aligi vin al sia kontaktlisto"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d-a %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d-a %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Posedanto"
@@ -466,8 +469,10 @@ msgstr ""
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -513,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Ĉeestantoj rajtas ŝanĝi temon"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Eltrovi verajn JID-ojn"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Kiu rajtas eltrovi verajn JID-ojn?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -529,7 +534,7 @@ msgid "Password"
 msgstr "Pasvorto"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
@@ -623,6 +628,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Sciigi pri envenaj mesaĝoj"
@@ -688,10 +697,6 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Neĉifrita"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -784,10 +789,46 @@ msgstr ""
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s, kaj %i aliaj"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Vi nun povas komenci uzanta %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Malfermi registriĝon"
+
+#~ msgid "Save"
+#~ msgstr "Konservi"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s kaj %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s kaj %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "tajpas…"
+#~ msgstr[1] "tajpas…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "ĉesis tajpi"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Eltrovi verajn JID-ojn"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Kiu rajtas eltrovi verajn JID-ojn?"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Malsukcesis konektanta al %s"
 
diff --git a/main/po/es.po b/main/po/es.po
index a38a8aa7..b9797b96 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-28 16:21+0000\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
 "translations/es/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "¡Bienvenido a Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Inicia sesión o crea una nueva cuenta para empezar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurar cuenta"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "No hay cuentas activas"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gestionar cuentas"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "No hay conversaciones activa"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Iniciar Conversación"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Unirse a canal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoy"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ayer"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Descargando %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ofreció: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Archivo ofrecido: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Archivo ofrecido"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferencia de archivo fallida"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensaje demasiado largo"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Aceptar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Denegar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "A este contacto le gustaría añadirte a su lista de contactos"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Sin cifrar"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "hace %i min"
+msgstr[1] "hace %i mins"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Ahora"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imagen enviada"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Archivo enviado"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imagen recibida"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Archivo recibido"
 
@@ -42,16 +228,6 @@ msgstr "Archivo recibido"
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Aceptar"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Denegar"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Seleccionar"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +316,8 @@ msgstr "Iniciar sesión con %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Puedes empezar a usar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "El servidor requiere registro a través de un sitio web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Registro abierto"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +361,12 @@ msgstr "Registro"
 msgid "Check %s for information on how to sign up"
 msgstr "Mira %s para mas información sobre el registro"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Yo"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "hace %i min"
-msgstr[1] "hace %i mins"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Ahora"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Unirse a canal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Unirse a canal"
 msgid "Join"
 msgstr "Unirse"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Añadir"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Guardar"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Siguiente"
 msgid "Back"
 msgstr "Volver"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar Conversación"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Iniciar"
@@ -313,124 +435,6 @@ msgstr "Elige un alias diferente"
 msgid "Too many occupants in room"
 msgstr "La conversación tiene demasiados ocupantes"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "¡Bienvenido a Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Inicia sesión o crea una nueva cuenta para empezar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurar cuenta"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "No hay cuentas activas"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gestionar cuentas"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "No hay conversaciones activa"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Descargando %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ofreció: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Archivo ofrecido: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Archivo ofrecido"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Transferencia de archivo fallida"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Hoy"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s y %i otros"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s y %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s y %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "está escribiendo…"
-msgstr[1] "están escribiendo…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "ha dejado de escribir"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mensaje demasiado largo"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "A este contacto le gustaría añadirte a su lista de contactos"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Propietario"
@@ -466,8 +470,10 @@ msgstr "Expulsar"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i resultados de la búsqueda"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -513,12 +519,12 @@ msgid "Occupants may change the subject"
 msgstr "Los ocupantes pueden cambiar el asunto de la conversación"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descubrir JIDs reales"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "¿Quién puede ver los JIDs reales?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -529,10 +535,8 @@ msgid "Password"
 msgstr "Contraseña"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
-"Contraseña requerida para entrar en la conversación en grupo. Dejar vacío "
-"para ninguna"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +629,10 @@ msgstr "Buscar mensajes"
 msgid "Members"
 msgstr "Miembros"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar cuando llega un nuevo mensaje"
@@ -690,10 +698,6 @@ msgstr "¡Todo preparado!"
 msgid "Finish"
 msgstr "Terminar"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Sin cifrar"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
@@ -796,10 +800,55 @@ msgstr ""
 "Pulsa aquí para empezar una nueva conversación o unirse a una conversación "
 "en grupo."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "No tienes conversaciones abiertas"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s y %i otros"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Puedes empezar a usar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Registro abierto"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s y %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s y %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "está escribiendo…"
+#~ msgstr[1] "están escribiendo…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "ha dejado de escribir"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i resultados de la búsqueda"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descubrir JIDs reales"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "¿Quién puede ver los JIDs reales?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr ""
+#~ "Contraseña requerida para entrar en la conversación en grupo. Dejar vacío "
+#~ "para ninguna"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Fallo conectando con %s"
 
diff --git a/main/po/eu.po b/main/po/eu.po
index fa495ef0..4660107e 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
-"PO-Revision-Date: 2019-12-21 12:21+0000\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
+"PO-Revision-Date: 2020-03-26 13:46+0000\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
 "eu/>\n"
 "Language: eu\n"
@@ -16,25 +16,211 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.0-dev\n"
+
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Ongi etorri Dinora!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Saioa hasi edo kontu bat sortu hasteko."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Kontu bat ezarri"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Ez dago kontu aktiborik"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Kontuak kudeatu"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Ez dago solasaldi aktiborik"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Elkarrizketa hasi"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanalera gehitu"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Gaur"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Atzo"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "%s deskargatzen…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s(e)k eskeini du: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fitxategia eskeini da: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fitxategia eskeinita"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Fitxategiaren transmisioak huts egin du"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mezu luzeegia"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Onartu"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Ukatu"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Kontaktu honek bere kontaktuen zerrendara gehitu nahi zaitu"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Enkriptatu gabe"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "orain dela min %i"
+msgstr[1] "orain dela %i min"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Orain"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Irudia bidali da"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fitxategia bidali da"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Irudia jaso da"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fitxategia jaso da"
 
@@ -42,16 +228,6 @@ msgstr "Fitxategia jaso da"
 msgid "Subscription request"
 msgstr "Harpidetzaren eskaera"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Onartu"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Ukatu"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -62,12 +238,12 @@ msgstr "Ezin izan da %s(e)ra konektatu"
 #: main/src/ui/notifications.vala:128
 #, c-format
 msgid "Invitation to %s"
-msgstr ""
+msgstr "%s(e)ra gonbidapena"
 
 #: main/src/ui/notifications.vala:129
 #, c-format
 msgid "%s invited you to %s"
-msgstr ""
+msgstr "%s(e)k %s(e)ra gonbidatu zaitu"
 
 #: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
@@ -90,6 +266,7 @@ msgstr "Hautatu"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +316,8 @@ msgstr "Hasi saioa %s(e)n"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Orain %s erabiltzen hasi zaitezke"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -148,7 +325,7 @@ msgstr "Orain %s erabiltzen hasi zaitezke"
 #: main/src/ui/manage_accounts/add_account_dialog.vala:382
 #: main/src/ui/add_conversation/conference_details_fragment.vala:191
 msgid "Invalid address"
-msgstr ""
+msgstr "Helbide ez balioduna"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:278
 msgid "Wrong username or password"
@@ -156,7 +333,7 @@ msgstr "Erabiltzaile izen edo pasahitz okerra"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:281
 msgid "Something went wrong"
-msgstr ""
+msgstr "Zerbait oker joan da"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:321
 msgid "No response from server"
@@ -172,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Zerbitzariak webgune baten bidez izena ematea eskatzen du"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Izen emate irekia"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +361,12 @@ msgstr "Izena eman"
 msgid "Check %s for information on how to sign up"
 msgstr "Ikusi %s izena ematearen inguruko informazioa lortzeko"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ni"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Atzo"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "orain dela min %i"
-msgstr[1] "orain dela %i min"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Orain"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Kanalera gehitu"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Kanalera gehitu"
 msgid "Join"
 msgstr "Batu"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
-msgstr ""
+msgstr "%s hemendik: %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Gehitu"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Gorde"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Hurrengoa"
 msgid "Back"
 msgstr "Atzera"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Elkarrizketa hasi"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Hasi"
@@ -312,124 +434,6 @@ msgstr "Ezizen ezberdin bat hautatu"
 msgid "Too many occupants in room"
 msgstr "Gelak kide gehiegi ditu"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Ongi etorri Dinora!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Kontu bat ezarri"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Ez dago kontu aktiborik"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Kontuak kudeatu"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Ez dago solasaldi aktiborik"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Gaur"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s eta beste %i"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s eta %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s eta %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "idazten ari da…"
-msgstr[1] "idazten ari dira…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "idazteari utzi dio"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mezu luzeegia"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Kontaktu honek bere kontaktuen zerrendara gehitu nahi zaitu"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Jabea"
@@ -465,8 +469,10 @@ msgstr "Kanporatu"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "Bilaketaren emaitzak: %i"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Okupatzaileek gaia alda dezakete"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Egiazko JIDak ikusi"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Nork ikus ditzake egiazko JIDak?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,9 +534,8 @@ msgid "Password"
 msgstr "Pasahitza"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
-"Gelan sartzeko beharrezko pasahitza, utzi zuriz pasahitzik ez ezartzeko"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -624,6 +629,10 @@ msgstr "Mezuak bilatu"
 msgid "Members"
 msgstr "Kideak"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Mezu berri bat heltzerakoan jakinarazi"
@@ -689,16 +698,11 @@ msgstr "Guztia ezarri da!"
 msgid "Finish"
 msgstr "Amaitu"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Enkriptatu gabe"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Laster-teklak"
 
 #: main/data/menu_app.ui:21
-#, fuzzy
 msgid "About Dino"
 msgstr "Dino buruz"
 
@@ -768,11 +772,11 @@ msgstr "Nabigazioa"
 
 #: main/data/shortcuts.ui:37
 msgid "Jump to next conversation"
-msgstr ""
+msgstr "Jauzi hurrengo elkarrizketara"
 
 #: main/data/shortcuts.ui:44
 msgid "Jump to previous conversation"
-msgstr ""
+msgstr "Jauzi aurreko elkarrizketara"
 
 #: main/data/global_search.ui:37
 msgid "No active search"
@@ -792,11 +796,55 @@ msgstr "Ortografia egiaztatu edo saiatu iragazkiak kentzen"
 
 #: main/data/unified_main_content.ui:48
 msgid "Click here to start a conversation or join a channel."
-msgstr ""
+msgstr "Klikatu hemen elkarrizketa berri bat hasi edo kanal batean sartzeko."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
-msgstr ""
+msgstr "Ez duzu irekitako txatik"
+
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s eta beste %i"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Orain %s erabiltzen hasi zaitezke"
+
+#~ msgid "Open Registration"
+#~ msgstr "Izen emate irekia"
+
+#~ msgid "Save"
+#~ msgstr "Gorde"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s eta %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s eta %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "idazten ari da…"
+#~ msgstr[1] "idazten ari dira…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "idazteari utzi dio"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "Bilaketaren emaitzak: %i"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Egiazko JIDak ikusi"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Nork ikus ditzake egiazko JIDak?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr ""
+#~ "Gelan sartzeko beharrezko pasahitza, utzi zuriz pasahitzik ez ezartzeko"
 
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Huts %s(e)ra konektatzerakoan"
diff --git a/main/po/fi.po b/main/po/fi.po
index d7aafdcd..a4cae5b1 100644
--- a/main/po/fi.po
+++ b/main/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2018-05-13 10:18+0000\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/dino/"
 "translations/fi/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.0-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr ""
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr ""
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr ""
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Ei aktiivisia tilejä"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Hallitse tilejä"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Ei aktiivisia keskusteluja"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Aloita keskustelu"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Liity kanavalle"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Tänään"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d. %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Viesti liian pitkä"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Hylkää"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Tämä käyttäjä haluaisi lisätä sinut yhteystietoihinsa"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Salaamaton"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d. %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d. %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min sitten"
+msgstr[1] "%i min sitten"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Juuri nyt"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr ""
 
@@ -42,16 +228,6 @@ msgstr ""
 msgid "Subscription request"
 msgstr "Yhteyspyyntö"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Hyväksy"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Hylkää"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Valitse"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,7 +316,7 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
+msgid "You can now start using the account %s"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
@@ -172,7 +349,7 @@ msgid "The server requires to sign up through a website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
+msgid "Open website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
@@ -184,55 +361,12 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Minä"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d. %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Eilen"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min sitten"
-msgstr[1] "%i min sitten"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Juuri nyt"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Liity kanavalle"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Liity kanavalle"
 msgid "Join"
 msgstr "Liity"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Lisää"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Tallenna"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Seuraava"
 msgid "Back"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Aloita keskustelu"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Aloita"
@@ -312,124 +434,6 @@ msgstr "Valitse jokin muu nimimerkki"
 msgid "Too many occupants in room"
 msgstr "Liikaa käyttäjiä huoneessa"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Ei aktiivisia tilejä"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Hallitse tilejä"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Ei aktiivisia keskusteluja"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Tänään"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s and %i muuta"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s ja %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s ja %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "kirjoittaa…"
-msgstr[1] "kirjoittavat…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "on lakannut kirjoittamasta"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Viesti liian pitkä"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Tämä käyttäjä haluaisi lisätä sinut yhteystietoihinsa"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d. %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d. %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Omistaja"
@@ -465,8 +469,10 @@ msgstr "Potkaise pihalle"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Käyttäjät voivat vaihtaa aihetta"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Näytä oikeat JID:t"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Kuka voi nähdä oikeat JID:t?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +534,8 @@ msgid "Password"
 msgstr "Salasana"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Huoneeseen vaadittava salasana, jos asetettu"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -622,6 +628,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Ilmoita kun uusi viesti saapuu"
@@ -687,10 +697,6 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Salaamaton"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -792,10 +798,42 @@ msgstr ""
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s and %i muuta"
+
+#~ msgid "Save"
+#~ msgstr "Tallenna"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s ja %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s ja %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "kirjoittaa…"
+#~ msgstr[1] "kirjoittavat…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "on lakannut kirjoittamasta"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Näytä oikeat JID:t"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Kuka voi nähdä oikeat JID:t?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Huoneeseen vaadittava salasana, jos asetettu"
+
 #~ msgid "Join Conference"
 #~ msgstr "Liity ryhmäkeskusteluun"
 
diff --git a/main/po/fr.po b/main/po/fr.po
index 0ae3be2e..9355e5cf 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
-"Last-Translator: Quentin Lejard <q.lejard@valde.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
 "fr/>\n"
 "Language: fr\n"
@@ -19,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Bienvenue dans Dino !"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Connecter-vous ou créer un compte pour commencer."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurer le compte"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Aucun compte actif"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gérer les comptes"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Aucune discussion en cours"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Commencer une discussion"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Rejoindre un salon"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Aujourd’hui"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Hier"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Téléchargement %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s a offert : %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fichier offert : %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fichier offert"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Échec du transfert de fichier"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Message trop long"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Accepter"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Refuser"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ce contact voudrait vous ajouter à sa liste de contacts"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non-chiffré"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Impossible d'envoyer le message"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %Hh%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %Hh%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %Hh%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%Hh%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Il y a %i minute"
+msgstr[1] "Il y a %i minutes"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "À l’instant"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Image envoyée"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fichier envoyé"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Image reçue"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fichier reçu"
 
@@ -43,16 +228,6 @@ msgstr "Fichier reçu"
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Accepter"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Refuser"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +266,7 @@ msgstr "Choisir"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +316,8 @@ msgstr "Se connecter à %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Vous pouvez maintenant utiliser %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Ce serveur nécessite de s’inscrire depuis son site web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Inscription ouverte"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,59 +361,12 @@ msgstr "S’inscrire"
 msgid "Check %s for information on how to sign up"
 msgstr "Consultez %s pour plus d’informations sur comment s’inscrire"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Moi"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Hier"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:144
-msgid "Unable to send message"
-msgstr "Impossible d'envoyer le message"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%Hh%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "Il y a %i minute"
-msgstr[1] "Il y a %i minutes"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "À l’instant"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Rejoindre un salon"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -245,20 +374,16 @@ msgstr "Rejoindre un salon"
 msgid "Join"
 msgstr "Rejoindre"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Ajouter"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Sauver"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -273,14 +398,6 @@ msgstr "Suivant"
 msgid "Back"
 msgstr "Retour"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Commencer une discussion"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Démarrer"
@@ -317,124 +434,6 @@ msgstr "Choisissez un autre pseudo"
 msgid "Too many occupants in room"
 msgstr "Trop de participants dans ce salon"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Bienvenue dans Dino !"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Connecter-vous ou créer un compte pour commencer."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurer le compte"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Aucun compte actif"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gérer les comptes"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Aucune discussion en cours"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Téléchargement %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s a offert : %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fichier offert : %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fichier offert"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Échec du transfert de fichier"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Aujourd’hui"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s et %i autres"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s et %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s et %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "est en train d’écrire…"
-msgstr[1] "sont en train d’écrire…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "a arrêté d’écrire"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Message trop long"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Ce contact voudrait vous ajouter à sa liste de contacts"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %Hh%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %Hh%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %Hh%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Propriétaire"
@@ -470,8 +469,10 @@ msgstr "Éjecter"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i résultats de recherche"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -517,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Les occupants peuvent changer le sujet"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Découverte des vrais JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Qui peut découvrir les vrais JID ?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -533,8 +534,8 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Mot de passe pour rejoindre le salon, vide pour aucun"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -627,6 +628,10 @@ msgstr "Rechercher des messages"
 msgid "Members"
 msgstr "Membres"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifier l’arrivée de nouveaux messages"
@@ -692,10 +697,6 @@ msgstr "Tout est prêt !"
 msgid "Finish"
 msgstr "Terminer"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non-chiffré"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
@@ -796,10 +797,53 @@ msgstr "Vérifiez l’orthographe ou essayez de supprimer des filtres"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Cliquez ici pour commencer une discussion ou rejoindre un salon."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Vous n'avez aucune discussion ouverte"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s et %i autres"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Vous pouvez maintenant utiliser %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Inscription ouverte"
+
+#~ msgid "Save"
+#~ msgstr "Sauver"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s et %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s et %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "est en train d’écrire…"
+#~ msgstr[1] "sont en train d’écrire…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "a arrêté d’écrire"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i résultats de recherche"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Découverte des vrais JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Qui peut découvrir les vrais JID ?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Mot de passe pour rejoindre le salon, vide pour aucun"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Échec de la connexion à %s"
 
diff --git a/main/po/gl.po b/main/po/gl.po
index 8517b251..dc9b3c6d 100644
--- a/main/po/gl.po
+++ b/main/po/gl.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-07 10:50+0000\n"
-"Last-Translator: Xosé M <xosem@disroot.org>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/"
 "translations/gl/>\n"
 "Language: gl\n"
@@ -19,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Benvida a Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Conectarse ou crear unha conta para comezar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurar conta"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Sen contas activas"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Xestionar contas"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Sen conversas activas"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Comezar conversa"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Unirse a unha canle"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoxe"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Onte"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Descargando %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ofreceuche: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Ficheiro ofrecido: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Ficheiro ofrecido"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Fallou a transferencia do ficheiro"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensaxe demasiado longa"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Aceptar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Rexeitar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Esta persoa gostaríalle engadirte á súa listaxe dos contactos"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrado"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fai %i min"
+msgstr[1] "fai %i minutos"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Xusto agora"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imaxe enviada"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Ficheiro enviado"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imaxe recibida"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Ficheiro recibido"
 
@@ -43,16 +228,6 @@ msgstr "Ficheiro recibido"
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Aceptar"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Rexeitar"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +266,7 @@ msgstr "Escoller"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +316,8 @@ msgstr "Conectar con %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Agora xa podes comezar a utilizar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "O servidor precisa que te rexistres a través dun sitio web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Rexistro aberto"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,55 +361,12 @@ msgstr "Rexistrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Olla en %s para máis información sobre o rexistro"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Onte"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "fai %i min"
-msgstr[1] "fai %i minutos"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Xusto agora"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Unirse a unha canle"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -241,20 +374,16 @@ msgstr "Unirse a unha canle"
 msgid "Join"
 msgstr "Unirse"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Engadir"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Gardar"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -269,14 +398,6 @@ msgstr "Seguinte"
 msgid "Back"
 msgstr "Atrás"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Comezar conversa"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Comezar"
@@ -313,124 +434,6 @@ msgstr "Escolle un alcume diferente"
 msgid "Too many occupants in room"
 msgstr "Demasiada xente na sala"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Benvida a Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Conectarse ou crear unha conta para comezar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurar conta"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Sen contas activas"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Xestionar contas"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Sen conversas activas"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Descargando %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ofreceuche: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Ficheiro ofrecido: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Ficheiro ofrecido"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Fallou a transferencia do ficheiro"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Hoxe"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s e %i outros"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "está a escribir…"
-msgstr[1] "están a escribir…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "deixou de escribir"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mensaxe demasiado longa"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Esta persoa gostaríalle engadirte á súa listaxe dos contactos"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Dono"
@@ -466,8 +469,10 @@ msgstr "Botar"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i resultados da procura"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -513,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Os participantes poden muda-lo asunto"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descobri-los JIDs reais"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Quen pode descobri-los JIDs reais?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -529,8 +534,8 @@ msgid "Password"
 msgstr "Contrasinal"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Contrasinal precisada para entrar na sala, se houbese"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +630,10 @@ msgstr "Buscar mensaxes"
 msgid "Members"
 msgstr "Membresía"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar cando chega unha nova mensaxe"
@@ -690,10 +699,6 @@ msgstr "Todo feito!"
 msgid "Finish"
 msgstr "Rematar"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non cifrado"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Atallos de teclado"
@@ -794,10 +799,53 @@ msgstr "Comprobe a escrita ou tente eliminar filtros"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Preme aquí para iniciar unha conversa ou unirte a unha canle."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Non tes conversas abertas"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s e %i outros"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Agora xa podes comezar a utilizar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Rexistro aberto"
+
+#~ msgid "Save"
+#~ msgstr "Gardar"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s e %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s e %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "está a escribir…"
+#~ msgstr[1] "están a escribir…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "deixou de escribir"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i resultados da procura"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descobri-los JIDs reais"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Quen pode descobri-los JIDs reais?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Contrasinal precisada para entrar na sala, se houbese"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Ocorreu un erro ó conectar cara %s"
 
diff --git a/main/po/hu.po b/main/po/hu.po
index 367638a2..73b256fe 100644
--- a/main/po/hu.po
+++ b/main/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-21 12:21+0000\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/"
 "translations/hu/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr ""
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr ""
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr ""
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Nincs aktív fiók"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Fiókok kezelése"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Nincs aktív beszélgetés"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Csevegés kezdeményezése"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Csatlakozás csatornához"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Ma"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Tegnap"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Az üzenet túl hosszú"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Elfogadás"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Tiltás"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ez az ismerős hozzá szeretne adni téged az ismerőslistájához"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Titkosítatlan"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %I:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %I:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%I:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i perccel ezelőtt"
+msgstr[1] "%i perccel ezelőtt"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Most"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Kép érkezett"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fájl érkezett"
 
@@ -42,16 +228,6 @@ msgstr "Fájl érkezett"
 msgid "Subscription request"
 msgstr "Feliratkozási kérés"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Elfogadás"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Tiltás"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Választ"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,7 +316,7 @@ msgstr "Jelentkezzen be a %s-ba"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
+msgid "You can now start using the account %s"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
@@ -172,7 +349,7 @@ msgid "The server requires to sign up through a website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
+msgid "Open website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
@@ -184,55 +361,12 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Én"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Tegnap"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%I:%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i perccel ezelőtt"
-msgstr[1] "%i perccel ezelőtt"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Most"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Csatlakozás csatornához"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Csatlakozás csatornához"
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Mentés"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Következő"
 msgid "Back"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Csevegés kezdeményezése"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Indítás"
@@ -312,124 +434,6 @@ msgstr "Válassz egy másik becenevet"
 msgid "Too many occupants in room"
 msgstr "Túl sok résztvevő van a szobában"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Nincs aktív fiók"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Fiókok kezelése"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Nincs aktív beszélgetés"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Ma"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s és %i további felhasználó"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s, és %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s és %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "gépel…"
-msgstr[1] "gépel…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "abbahagyta a gépelést"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Az üzenet túl hosszú"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Ez az ismerős hozzá szeretne adni téged az ismerőslistájához"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %I:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %I:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Tulajdonos"
@@ -465,8 +469,10 @@ msgstr "Kirúgás"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Résztvevők megváltoztathatják a témát"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Valódi JID-k megtekintése"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Ki láthatja a valódi JID-ket?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +534,8 @@ msgid "Password"
 msgstr "Jelszó"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "A szobába lépéshez szükséges jelszó, ha van"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -623,6 +629,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Értesítés új üzenet érkezésekor"
@@ -688,10 +698,6 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Titkosítatlan"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
@@ -793,10 +799,42 @@ msgstr ""
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s és %i további felhasználó"
+
+#~ msgid "Save"
+#~ msgstr "Mentés"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s, és %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s és %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "gépel…"
+#~ msgstr[1] "gépel…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "abbahagyta a gépelést"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Valódi JID-k megtekintése"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Ki láthatja a valódi JID-ket?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "A szobába lépéshez szükséges jelszó, ha van"
+
 #~ msgid "Join Conference"
 #~ msgstr "Csatlakozás konferenciához"
 
diff --git a/main/po/ie.po b/main/po/ie.po
index b3c73f5a..ff412e5c 100644
--- a/main/po/ie.po
+++ b/main/po/ie.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
-"Last-Translator: OIS <mistresssilvara@hotmail.com>\n"
 "Language-Team: none\n"
 "Language: ie\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Benevenit a Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Inregistra vos o crea un conto por iniciar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Etablisser un conto"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Null activ contos"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gerer contos"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Null activ conversationes"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Iniciar un conversation"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Adherer al chanele"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hodie"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Yer"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%e %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Descargante %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ha ofertat: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "File sta ofertat: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Un file sta ofertat"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferte de un file ne successat"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Li missage es tre long"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Acceptar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Refusar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ti-ci contacte desira adjunter vos al su contact-liste"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ínciffrat"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%e %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%e %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "ante %i min"
+msgstr[1] "ante %i mins"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Strax"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Image sta inviat"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "File sta inviat"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Image sta recivet"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Image es recivet"
 
@@ -42,16 +227,6 @@ msgstr "Image es recivet"
 msgid "Subscription request"
 msgstr "Petition de abonnament"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Acceptar"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Refusar"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +265,7 @@ msgstr "Selecter"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +315,8 @@ msgstr "Inregistrar se in %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Nu vu posse usar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Li servitor besona r"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Apert registration"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +360,12 @@ msgstr "Registrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Visita %s por li information pri registration"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Yo"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%e %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Yer"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l:%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "ante %i min"
-msgstr[1] "ante %i mins"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Strax"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Adherer al chanele"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +373,16 @@ msgstr "Adherer al chanele"
 msgid "Join"
 msgstr "Adherer"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Adjunter"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Gardar quam"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +397,6 @@ msgstr "Avan"
 msgid "Back"
 msgstr "Retro"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar un conversation"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Iniciar"
@@ -312,124 +433,6 @@ msgstr "Selecte un different nómine"
 msgid "Too many occupants in room"
 msgstr "Tro mult occupantes in li chambre"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Benevenit a Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Inregistra vos o crea un conto por iniciar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Etablisser un conto"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Null activ contos"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gerer contos"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Null activ conversationes"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Descargante %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ha ofertat: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "File sta ofertat: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Un file sta ofertat"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Transferte de un file ne successat"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Hodie"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s e %i altri"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "tippa…"
-msgstr[1] "tippa…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "ne tippa plu"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Li missage es tre long"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Ti-ci contacte desira adjunter vos al su contact-liste"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%e %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%e %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Proprietario"
@@ -465,8 +468,10 @@ msgstr "Remover"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "resultates: %i"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +517,12 @@ msgid "Occupants may change the subject"
 msgstr "Occupantes posse cambiar li tema"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Decovrir real JIDs"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Qui posse decovrir real JIDs?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +533,8 @@ msgid "Password"
 msgstr "Contrasigne"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Un contrasigne por intrar li chambre"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -622,6 +627,10 @@ msgstr "Serchar missages"
 msgid "Members"
 msgstr "Membres"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar quande un missage ariva"
@@ -687,10 +696,6 @@ msgstr "Omni es pret!"
 msgid "Finish"
 msgstr "Finir"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Ínciffrat"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Rapid-tastes"
@@ -790,6 +795,49 @@ msgstr "Controla li ortografie o remove filtres"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Fa un clic ti-ci por iniciar un conversation o adherer a un channel."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Vu ne have apertet conversationes"
+
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s e %i altri"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Nu vu posse usar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Apert registration"
+
+#~ msgid "Save"
+#~ msgstr "Gardar quam"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s e %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s e %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "tippa…"
+#~ msgstr[1] "tippa…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "ne tippa plu"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "resultates: %i"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Decovrir real JIDs"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Qui posse decovrir real JIDs?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Un contrasigne por intrar li chambre"
diff --git a/main/po/it.po b/main/po/it.po
index 86d0a7e2..6966c115 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
-"Last-Translator: Michael Moroni <michaelmoroni@disroot.org>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
 "translations/it/>\n"
 "Language: it\n"
@@ -19,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Benvenuto in Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Accedi o crea un account per iniziare."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configura account"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Nessun account attivo"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gestisci account"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Nessuna conversazione attiva"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Inizia una conversazione"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Entra nel canale"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Oggi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Scaricamento di %s in corso…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ha offerto: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "File offerto: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "File offerto"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Trasferimento del file non riuscito"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Messaggio troppo lungo"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Accetta"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Rifiuta"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Questo contatto vorrebbe aggiungerti alla sua lista contatti"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrato"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minuto fa"
+msgstr[1] "%i minuti fa"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Adesso"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Immagine inviata"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "File inviato"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Immagine ricevuta"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "File ricevuto"
 
@@ -43,16 +228,6 @@ msgstr "File ricevuto"
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Accetta"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Rifiuta"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +266,7 @@ msgstr "Seleziona"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +316,8 @@ msgstr "Accedi a %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Adesso puoi iniziare ad usare %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Il server richiede di registrarsi tramite un sito web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Registrazioni aperte"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,55 +361,12 @@ msgstr "Registrati"
 msgid "Check %s for information on how to sign up"
 msgstr "Controlla %s per informazioni su come registrarsi"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Io"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ieri"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l:%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minuto fa"
-msgstr[1] "%i minuti fa"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Adesso"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Entra nel canale"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -241,20 +374,16 @@ msgstr "Entra nel canale"
 msgid "Join"
 msgstr "Partecipa"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s da %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Aggiungi"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Salva"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -269,14 +398,6 @@ msgstr "Avanti"
 msgid "Back"
 msgstr "Indietro"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Inizia una conversazione"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Inizia"
@@ -313,124 +434,6 @@ msgstr "Scegli un soprannome differente"
 msgid "Too many occupants in room"
 msgstr "La stanza ha troppi partecipanti"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Benvenuto in Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Accedi o crea un account per iniziare."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configura account"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Nessun account attivo"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gestisci account"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Nessuna conversazione attiva"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Scaricamento di %s in corso…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ha offerto: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "File offerto: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "File offerto"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Trasferimento del file non riuscito"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Oggi"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s e %i altri"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s, e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "sta scrivendo…"
-msgstr[1] "stanno scrivendo…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "ha smesso di scrivere"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Messaggio troppo lungo"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Questo contatto vorrebbe aggiungerti alla sua lista contatti"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l:%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Proprietario"
@@ -466,8 +469,10 @@ msgstr "Espelli"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i risultati per la ricerca"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -513,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "I partecipanti possono cambiare l'argomento"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Scopri i veri JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Chi può scoprire i veri JID?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -529,8 +534,8 @@ msgid "Password"
 msgstr "Password"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Password richiesta per entrare nella stanza, se impostata"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +630,10 @@ msgstr "Cerca tra i messaggi"
 msgid "Members"
 msgstr "Partecipanti"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifica quando arriva un nuovo messaggio"
@@ -690,10 +699,6 @@ msgstr "Tutto pronto!"
 msgid "Finish"
 msgstr "Fine"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non cifrato"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
@@ -795,10 +800,53 @@ msgid "Click here to start a conversation or join a channel."
 msgstr ""
 "Fai clic qui per iniziare una conversazione o per entrare in un canale."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Non hai chat aperte"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s e %i altri"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Adesso puoi iniziare ad usare %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Registrazioni aperte"
+
+#~ msgid "Save"
+#~ msgstr "Salva"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s, e %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s e %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "sta scrivendo…"
+#~ msgstr[1] "stanno scrivendo…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "ha smesso di scrivere"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i risultati per la ricerca"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Scopri i veri JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Chi può scoprire i veri JID?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Password richiesta per entrare nella stanza, se impostata"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Connessione a %s fallita"
 
diff --git a/main/po/ja.po b/main/po/ja.po
index 67d29aff..262334cb 100644
--- a/main/po/ja.po
+++ b/main/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-28 23:24+0000\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/dino/"
 "translations/ja/>\n"
@@ -18,23 +18,208 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Dino へようこそ！"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "サインインまたはアカウント登録をしてください。"
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "アカウントをセットアップ"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "アクティブなアカウントがありません"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "アカウントを管理"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "アクティブなトークがありません"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "トークを開始"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "チャンネルに参加"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今日"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "昨日"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b%d日 (%a)"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b%d日"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "%s をダウンロードしています…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, fuzzy, c-format
+msgid "%s offered: %s"
+msgstr "%s から提供されているファイル: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, fuzzy, c-format
+msgid "File offered: %s"
+msgstr "提供されているファイル: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "ファイルが提供されています"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "ファイルの転送に失敗しました"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "メッセージが長すぎます"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "承諾"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "拒否"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "この相手があなたを連絡先に入れようとしています"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "非暗号化"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x、%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x、%p %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b%d日、%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b%d日、%p %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a曜日、%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a曜日、%p %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%p %l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分前"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "たった今"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "画像を送信しました"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "ファイルを送信しました"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "画像を受信しました"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "ファイルを受信しました"
 
@@ -42,16 +227,6 @@ msgstr "ファイルを受信しました"
 msgid "Subscription request"
 msgstr "在席通知の申込"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "承諾"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "拒否"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +265,7 @@ msgstr "選択"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +315,8 @@ msgstr "%s にサインイン"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "%s をお使いいただけます"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "サーバーが Web サイトでのサインアップを要求しています"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "登録を開く"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,54 +360,12 @@ msgstr "登録"
 msgid "Check %s for information on how to sign up"
 msgstr "サインアップの方法に関する情報は、%s をご確認ください"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "自分"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b%d日"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "昨日"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%p %l∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分前"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "たった今"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "チャンネルに参加"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -239,20 +373,16 @@ msgstr "チャンネルに参加"
 msgid "Join"
 msgstr "参加"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%2$s の %1$s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "追加"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "保存"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -267,14 +397,6 @@ msgstr "次へ"
 msgid "Back"
 msgstr "戻る"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "トークを開始"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "開始"
@@ -311,123 +433,6 @@ msgstr "別のニックネームを選んでください"
 msgid "Too many occupants in room"
 msgstr "トークルームの参加者が多すぎます"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Dino へようこそ！"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "サインインまたはアカウント登録をしてください。"
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "アカウントをセットアップ"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "アクティブなアカウントがありません"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "アカウントを管理"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "アクティブなトークがありません"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "%s をダウンロードしています…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, fuzzy, c-format
-msgid "%s offered: %s"
-msgstr "%s から提供されているファイル: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, fuzzy, c-format
-msgid "File offered: %s"
-msgstr "提供されているファイル: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "ファイルが提供されています"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "ファイルの転送に失敗しました"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "今日"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%b%d日 (%a)"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s さん、%s さんとその他 %i 人"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s さん、%s さんと %s さん"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s さんと %s さん"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "が入力しています…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "が入力を中断しました"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "メッセージが長すぎます"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "この相手があなたを連絡先に入れようとしています"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x、%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x、%p %l∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b%d日、%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b%d日、%p %l∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a曜日、%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a曜日、%p %l∶%M"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "オーナー"
@@ -463,8 +468,9 @@ msgstr "退出させる"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i 件の検索結果"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -510,12 +516,12 @@ msgid "Occupants may change the subject"
 msgstr "参加者にタイトルの変更を許可する"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "JID の検索"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "JID の検索を許可する対象"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -526,8 +532,8 @@ msgid "Password"
 msgstr "パスワード"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "トークルームへの参加に必要なパスワード"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -620,6 +626,10 @@ msgstr "メッセージを検索"
 msgid "Members"
 msgstr "メンバー"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "新しいメッセージが届いたときに通知"
@@ -685,10 +695,6 @@ msgstr "すべてのセットアップが完了しました！"
 msgid "Finish"
 msgstr "完了"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "非暗号化"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
@@ -789,10 +795,52 @@ msgstr ""
 "トークを始めたりトークルームに参加したりするには、ここをクリックしてくださ"
 "い。"
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "表示するトークはまだありません"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s さん、%s さんとその他 %i 人"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "%s をお使いいただけます"
+
+#~ msgid "Open Registration"
+#~ msgstr "登録を開く"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s さん、%s さんと %s さん"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s さんと %s さん"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "が入力しています…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "が入力を中断しました"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i 件の検索結果"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "JID の検索"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "JID の検索を許可する対象"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "トークルームへの参加に必要なパスワード"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "%s への接続に失敗しました"
 
diff --git a/main/po/lb.po b/main/po/lb.po
index 1ca929ba..01e2778b 100644
--- a/main/po/lb.po
+++ b/main/po/lb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Luxembourgish (Dino)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-27 15:41+0000\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
 "translations/lb/>\n"
@@ -13,23 +13,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Wëllkomm bei Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Logg dech an oder kreéier een Account fir lass ze leen."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Konto opsetzen"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Keng Kontoen aktiv"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Kontoe managen"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Keng Conversatiounen aktiv"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Konversatioun starten"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanal bäitrieden"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Haut"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Gëschter"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Lueden %s erof…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s offréiert: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Datei offréiert: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Datei offréiert"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Dateitransfert ass feelgeschloen"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Noriicht ze laang"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Akzeptéieren"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Verweigeren"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Dëse Kontakt wéilt dech gären an seng Kontaktlecht ophuelen"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onverschlësselt"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i Minutt hier"
+msgstr[1] "%i Minutten hier"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Just elo"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Bild geschéckt"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Datei geschéckt"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Bild kritt"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Datei kritt"
 
@@ -37,16 +223,6 @@ msgstr "Datei kritt"
 msgid "Subscription request"
 msgstr "Abonnement Ufro"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Akzeptéieren"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Verweigeren"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -85,6 +261,7 @@ msgstr "Auswielen"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -134,8 +311,8 @@ msgstr "Bei %s umellen"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Du kanns elo %s benotzen"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -167,8 +344,8 @@ msgid "The server requires to sign up through a website"
 msgstr "De Server setzt eng Registréierung duerch eng Websäit viraus"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Oppe Registréierung"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -179,55 +356,12 @@ msgstr "Registréieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Kuck %s fir Informatioune iwwert Registréierung"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ech"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Gëschter"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l:%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i Minutt hier"
-msgstr[1] "%i Minutten hier"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Just elo"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Kanal bäitrieden"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -235,20 +369,16 @@ msgstr "Kanal bäitrieden"
 msgid "Join"
 msgstr "Bäitrieden"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s vum %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Späicheren"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -263,14 +393,6 @@ msgstr "Nächst"
 msgid "Back"
 msgstr "Zeréck"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Konversatioun starten"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Start"
@@ -307,124 +429,6 @@ msgstr "Wiel een anere Spëtznumm"
 msgid "Too many occupants in room"
 msgstr "De Raum huet ze vill Benotzer"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Wëllkomm bei Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Logg dech an oder kreéier een Account fir lass ze leen."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Konto opsetzen"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Keng Kontoen aktiv"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Kontoe managen"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Keng Conversatiounen aktiv"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Lueden %s erof…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s offréiert: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Datei offréiert: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Datei offréiert"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Dateitransfert ass feelgeschloen"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Haut"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s an %i anerer"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s an %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s an %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "tippt grad…"
-msgstr[1] "tippe grad…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "huet opgehalen ze tippen"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Noriicht ze laang"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Dëse Kontakt wéilt dech gären an seng Kontaktlecht ophuelen"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l:%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Besëtzer"
@@ -460,8 +464,10 @@ msgstr "Erausgeheien"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i Sichresultater"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -507,12 +513,12 @@ msgid "Occupants may change the subject"
 msgstr "Benotzer däerfe Sujet änneren"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Echt JIDs gesinn"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Ween däerf echt JIDs gesinn?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -523,8 +529,8 @@ msgid "Password"
 msgstr "Passwuert"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Passwuert fir de Raum ze betrieden, wann een gebraucht gëtt"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -617,6 +623,10 @@ msgstr "Messagen duerchsichen"
 msgid "Members"
 msgstr "Memberen"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benoriichtege wann een neie Message ukënnt"
@@ -682,10 +692,6 @@ msgstr "Alles ageriicht!"
 msgid "Finish"
 msgstr "Ofschléissen"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onverschlësselt"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturofkierzungen"
@@ -786,10 +792,53 @@ msgid "Click here to start a conversation or join a channel."
 msgstr ""
 "Klick hei fir eng Konversatioun ze starten oder engem Channel bäizetrieden."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Du hues keng oppen Chats"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s an %i anerer"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Du kanns elo %s benotzen"
+
+#~ msgid "Open Registration"
+#~ msgstr "Oppe Registréierung"
+
+#~ msgid "Save"
+#~ msgstr "Späicheren"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s an %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s an %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "tippt grad…"
+#~ msgstr[1] "tippe grad…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "huet opgehalen ze tippen"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i Sichresultater"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Echt JIDs gesinn"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Ween däerf echt JIDs gesinn?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Passwuert fir de Raum ze betrieden, wann een gebraucht gëtt"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Feeler beim connectéieren op %s"
 
diff --git a/main/po/lt.po b/main/po/lt.po
index 47b51c9e..859047f5 100644
--- a/main/po/lt.po
+++ b/main/po/lt.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-01 15:50+0000\n"
-"Last-Translator: Moo <hazap@hotmail.com>\n"
 "Language-Team: none\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
@@ -20,23 +19,210 @@ msgstr ""
 "1 : 2);\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Sveiki atvykę į Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Norėdami pradėti, prisijunkite arba susikurkite paskyrą."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Nusistatyti paskyrą"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Aktyvių paskyrų nėra"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Tvarkyti paskyras"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Aktyvių pokalbių nėra"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Pradėti pokalbį"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Prisijungti prie kanalo"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Šiandien"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Vakar"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b %d, %a"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Atsisiunčiama %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s pasiūlė: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Pasiūlytas failas: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Pasiūlytas failas"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Failo persiuntimas nepavyko"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Žinutė per ilga"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Priimti"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Atmesti"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Šis adresatas norėtų jus pridėti į savo adresatų sąrašą"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Nešifruota"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "prieš %i minutę"
+msgstr[1] "prieš %i minutes"
+msgstr[2] "prieš %i minučių"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Ką tik"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Paveikslas išsiųstas"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Failas išsiųstas"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Paveikslas gautas"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Failas gautas"
 
@@ -44,16 +230,6 @@ msgstr "Failas gautas"
 msgid "Subscription request"
 msgstr "Prenumeratos užklausa"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Priimti"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Atmesti"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -92,6 +268,7 @@ msgstr "Pasirinkti"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -141,8 +318,8 @@ msgstr "Prisijungti prie %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Dabar, galite pradėti naudoti %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -174,8 +351,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Serveris reikalauja registruotis per internetinę svetainę"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Atverti registraciją"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -186,56 +363,12 @@ msgstr "Registruotis"
 msgid "Check %s for information on how to sign up"
 msgstr "Išsamesnei informacijai apie registraciją, žiūrėkite %s"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Aš"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Vakar"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "prieš %i minutę"
-msgstr[1] "prieš %i minutes"
-msgstr[2] "prieš %i minučių"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Ką tik"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Prisijungti prie kanalo"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -243,20 +376,16 @@ msgstr "Prisijungti prie kanalo"
 msgid "Join"
 msgstr "Prisijungti"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s iš %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Pridėti"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Įrašyti"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -271,14 +400,6 @@ msgstr "Kitas"
 msgid "Back"
 msgstr "Atgal"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Pradėti pokalbį"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Pradėti"
@@ -315,125 +436,6 @@ msgstr "Pasirinkti kitą slapyvardį"
 msgid "Too many occupants in room"
 msgstr "Kambaryje per daug žmonių"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Sveiki atvykę į Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Norėdami pradėti, prisijunkite arba susikurkite paskyrą."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Nusistatyti paskyrą"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Aktyvių paskyrų nėra"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Tvarkyti paskyras"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Aktyvių pokalbių nėra"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Atsisiunčiama %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s pasiūlė: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Pasiūlytas failas: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Pasiūlytas failas"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Failo persiuntimas nepavyko"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Šiandien"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%b %d, %a"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s ir dar %i"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s ir %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s ir %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "rašo…"
-msgstr[1] "rašo…"
-msgstr[2] "rašo…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "nustojo rašyti"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Žinutė per ilga"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Šis adresatas norėtų jus pridėti į savo adresatų sąrašą"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Savininkas"
@@ -469,8 +471,11 @@ msgstr "Išvaryti"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "Paieškos rezultatų: %i"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -516,12 +521,12 @@ msgid "Occupants may change the subject"
 msgstr "Lankytojai gali keisti temą"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Atrasti tikruosius JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Kas gali atrasti tikruosius JID?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -532,8 +537,8 @@ msgid "Password"
 msgstr "Slaptažodis"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Jei nustatytas, norint užeiti į kambarį bus reikalaujama slaptažodžio"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -575,7 +580,8 @@ msgstr "Blokuoti"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
-msgstr "Abiejomis kryptimis bus blokuojamas bendravimas ir būsenos atnaujinimai"
+msgstr ""
+"Abiejomis kryptimis bus blokuojamas bendravimas ir būsenos atnaujinimai"
 
 #: main/src/ui/contact_details/settings_provider.vala:13
 msgid "Local Settings"
@@ -626,6 +632,10 @@ msgstr "Ieškoti žinučių"
 msgid "Members"
 msgstr "Nariai"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Pranešti, kai gaunama nauja žinutė"
@@ -691,10 +701,6 @@ msgstr "Viskas nustatyta!"
 msgid "Finish"
 msgstr "Užbaigti"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Nešifruota"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Trumpiniai"
@@ -795,6 +801,51 @@ msgstr "Patikrinkite rašybą arba pabandykite pašalinti filtrus"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Spustelėkite čia norėdami pradėti pokalbį ar prisijungti prie kanalo."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Neturite jokių atvertų pokalbių"
+
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s ir dar %i"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Dabar, galite pradėti naudoti %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Atverti registraciją"
+
+#~ msgid "Save"
+#~ msgstr "Įrašyti"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s ir %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s ir %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "rašo…"
+#~ msgstr[1] "rašo…"
+#~ msgstr[2] "rašo…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "nustojo rašyti"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "Paieškos rezultatų: %i"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Atrasti tikruosius JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Kas gali atrasti tikruosius JID?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr ""
+#~ "Jei nustatytas, norint užeiti į kambarį bus reikalaujama slaptažodžio"
diff --git a/main/po/nb.po b/main/po/nb.po
index 2f84c672..3b506884 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-26 23:21+0000\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
 "translations/nb_NO/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Velkommen til Dino."
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Logg inn eller opprett en konto for å starte."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Sett opp konto"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Ingen kontoer aktive"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Behandle kontoer"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Ingen kontoer aktive"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Start samtale"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Ta del i kanal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "I dag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "I går"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Laster ned %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s tilbød: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fil tilbudt: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fil tilbudt"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Filoverføring mislyktes"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Meldingen er for lang"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Godta"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Nekt"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Denne kontakten ønsker å legge deg til på kontaktlisten sin"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minutt siden"
+msgstr[1] "%i minutter siden"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Akkurat nå"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Bilde sendt"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fil sendt"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Bilde mottatt"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fil mottatt"
 
@@ -42,16 +228,6 @@ msgstr "Fil mottatt"
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Godta"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Nekt"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Velg"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +316,8 @@ msgstr "Logg inn på %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Du kan nå begynne å bruke %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Tjeneren krever at man logger inn via en nettside"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Åpne registrering"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +361,12 @@ msgstr "Registrer"
 msgid "Check %s for information on how to sign up"
 msgstr "Se %s for å lære hvordan du registrerer deg"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Meg"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "I går"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minutt siden"
-msgstr[1] "%i minutter siden"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Akkurat nå"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Ta del i kanal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Ta del i kanal"
 msgid "Join"
 msgstr "Ta del"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s fra %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Legg til"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Lagre"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Neste"
 msgid "Back"
 msgstr "Tilbake"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Start samtale"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Start"
@@ -312,124 +434,6 @@ msgstr "Velg et annet kallenavn"
 msgid "Too many occupants in room"
 msgstr "Rommet har for mange deltagere"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Velkommen til Dino."
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Logg inn eller opprett en konto for å starte."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Sett opp konto"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Ingen kontoer aktive"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Behandle kontoer"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Ingen kontoer aktive"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Laster ned %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s tilbød: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fil tilbudt: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fil tilbudt"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Filoverføring mislyktes"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "I dag"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s og %i andre"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s og %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s og %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "skriver…"
-msgstr[1] "skriver…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "har tatt pause i skrivinga"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Meldingen er for lang"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Denne kontakten ønsker å legge deg til på kontaktlisten sin"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Eier"
@@ -465,8 +469,10 @@ msgstr "Kast ut"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i søkeresultater"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +518,12 @@ msgid "Occupants may change the subject"
 msgstr "Deltagere kan endre emne"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Oppdag ekte JID-er"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Hvem har tilgang til oppdagelse av ekte JID-er?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +534,8 @@ msgid "Password"
 msgstr "Passord"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Passord som kreves for å ta del i rommet. La stå tomt for inget"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -622,6 +628,10 @@ msgstr "Søk i meldinger"
 msgid "Members"
 msgstr "Medlemmer"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Varsle ved mottak av ny melding"
@@ -687,10 +697,6 @@ msgstr "Ferdig oppsatt."
 msgid "Finish"
 msgstr "Fullfør"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
@@ -791,10 +797,53 @@ msgstr "Sjekk stavingen eller prøv å fjerne filter"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Klikk her for å starte en samtale, eller ta del i en kanal."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Du har ingen åpne sludringer"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s og %i andre"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Du kan nå begynne å bruke %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Åpne registrering"
+
+#~ msgid "Save"
+#~ msgstr "Lagre"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s og %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s og %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "skriver…"
+#~ msgstr[1] "skriver…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "har tatt pause i skrivinga"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i søkeresultater"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Oppdag ekte JID-er"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Hvem har tilgang til oppdagelse av ekte JID-er?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Passord som kreves for å ta del i rommet. La stå tomt for inget"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Klarte ikke å koble til %s"
 
diff --git a/main/po/nl.po b/main/po/nl.po
index 2d56bf3d..0bfa5cad 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-16 00:21+0000\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
 "nl/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Welkom bij Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Log in of maak een account om te beginnen."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Account instellen"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Geen accounts actief"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Accounts beheren"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Geen gesprekken actief"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Gesprek beginnen"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Deelnemen aan kanaal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Vandaag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Gisteren"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Downloaden %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s bood aan: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Bestand aangeboden: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Bestand aangeboden"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Bestandsoverdracht mislukt"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Bericht te lang"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Toestaan"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Afwijzen"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Dit contact wil u toevoegen aan zijn/haar contacten"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onversleuteld"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min geleden"
+msgstr[1] "%i min geleden"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Zojuist"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Afbeelding verzonden"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Bestand verzonden"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Afbeelding ontvangen"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Bestand ontvangen"
 
@@ -42,16 +228,6 @@ msgstr "Bestand ontvangen"
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Toestaan"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Afwijzen"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Selecteren"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +316,8 @@ msgstr "Inloggen bij %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "U kunt %s nu beginnen gebruiken"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "De server vereist registratie via een website"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Open registratie"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +361,12 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijk %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min geleden"
-msgstr[1] "%i min geleden"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Zojuist"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Deelnemen aan kanaal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Deelnemen aan kanaal"
 msgid "Join"
 msgstr "Deelnemen"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s in %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Toevoegen"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Opslaan"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Volgende"
 msgid "Back"
 msgstr "Terug"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Gesprek beginnen"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Beginnen"
@@ -312,124 +434,6 @@ msgstr "Kies een andere bijnaam"
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Welkom bij Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Log in of maak een account om te beginnen."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Account instellen"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Geen accounts actief"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Accounts beheren"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Geen gesprekken actief"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Downloaden %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s bood aan: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Bestand aangeboden: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Bestand aangeboden"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Bestandsoverdracht mislukt"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Vandaag"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s en %i anderen"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s en %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s en %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "is aan het typen…"
-msgstr[1] "zijn aan het typen…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "is gestopt met typen"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Bericht te lang"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Dit contact wil u toevoegen aan zijn/haar contacten"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H:%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Eigenaar"
@@ -465,8 +469,10 @@ msgstr "Schoppen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i zoekresultaten"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -513,12 +519,12 @@ msgid "Occupants may change the subject"
 msgstr "Deelnemers kunnen onderwerp aanpassen"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Zichtbaarheid van JID’s"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Wie mag de JID’s van de deelnemers zien?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -529,8 +535,8 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Wachtwoord voor groepsgesprek, indien nodig"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -623,6 +629,10 @@ msgstr "Zoek berichten"
 msgid "Members"
 msgstr "Leden"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Melding tonen bij nieuw bericht"
@@ -688,10 +698,6 @@ msgstr "Klaar!"
 msgid "Finish"
 msgstr "Voltooien"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onversleuteld"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
@@ -792,10 +798,53 @@ msgstr "Controleer de spelling of probeer filters te verwijderen"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Klik hier om een gesprek te beginnen of een kanaal te openen."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Je hebt geen open chats"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s en %i anderen"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "U kunt %s nu beginnen gebruiken"
+
+#~ msgid "Open Registration"
+#~ msgstr "Open registratie"
+
+#~ msgid "Save"
+#~ msgstr "Opslaan"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s en %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s en %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "is aan het typen…"
+#~ msgstr[1] "zijn aan het typen…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "is gestopt met typen"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i zoekresultaten"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Zichtbaarheid van JID’s"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Wie mag de JID’s van de deelnemers zien?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Wachtwoord voor groepsgesprek, indien nodig"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Verbinden met %s mislukt"
 
diff --git a/main/po/nl_BE.po b/main/po/nl_BE.po
index b1b72f5f..3eddbf6f 100644
--- a/main/po/nl_BE.po
+++ b/main/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-01-12 20:06+0000\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/dino/"
 "translations/nl_BE/>\n"
@@ -18,23 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.4-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Welkom bij Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr ""
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Account instellen"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Geen accounts actief"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Accounts beheren"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Geen gesprekken actief"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Gesprek beginnen"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Deelnemen aan kanaal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Vandaag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Gisteren"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Bericht te lang"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Toestaan"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Afwijzen"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Dit contact wilt u toevoegen aan zijn/haar contacten"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onversleuteld"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %Hu%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %lu%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %Hu%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %lu%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %Hu%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %lu%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%Hu%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%lu%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min geleden"
+msgstr[1] "%i min geleden"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Zojuist"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Afbeelding verzonden"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Bestand verzonden"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Afbeelding ontvangen"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Bestand ontvangen"
 
@@ -42,16 +228,6 @@ msgstr "Bestand ontvangen"
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Toestaan"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Afwijzen"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +266,7 @@ msgstr "Selecteren"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +316,8 @@ msgstr "Inloggen bij %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Ge kunt %s nu beginnen gebruiken"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +349,8 @@ msgid "The server requires to sign up through a website"
 msgstr "De server vereist registratie via ne website"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Open registratie"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +361,12 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijkt %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%Hu%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%lu%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min geleden"
-msgstr[1] "%i min geleden"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Zojuist"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Deelnemen aan kanaal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +374,16 @@ msgstr "Deelnemen aan kanaal"
 msgid "Join"
 msgstr "Deelnemen"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Toevoegen"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Opslaan"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +398,6 @@ msgstr "Volgende"
 msgid "Back"
 msgstr "Terug"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Gesprek beginnen"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Beginnen"
@@ -312,124 +434,6 @@ msgstr "Kiest nen anderen bijnaam"
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Welkom bij Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Account instellen"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Geen accounts actief"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Accounts beheren"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Geen gesprekken actief"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Vandaag"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s en %i anderen"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s en %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s en %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "is aan het typen…"
-msgstr[1] "zijn aan het typen…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "is gestopt met typen"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Bericht te lang"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Dit contact wilt u toevoegen aan zijn/haar contacten"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %Hu%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %lu%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %Hu%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %lu%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %Hu%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %lu%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Eigenaar"
@@ -465,8 +469,10 @@ msgstr "Schoppen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i zoekresultaten"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -514,12 +520,12 @@ msgid "Occupants may change the subject"
 msgstr "Deelnemers kunnen onderwerp aanpassen"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Zichtbaarheid van JID’s"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Wie mag de JID’s van de deelnemers zien?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -530,8 +536,8 @@ msgid "Password"
 msgstr "Paswoord"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Paswoord voor groepsgesprek, indien nodig"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +631,10 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Melding tonen bij nieuw bericht"
@@ -690,10 +700,6 @@ msgstr "Klaar!"
 msgid "Finish"
 msgstr "Voltooien"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onversleuteld"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -794,10 +800,53 @@ msgstr "Controleert de spelling of probeert filters te verwijderen"
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s en %i anderen"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Ge kunt %s nu beginnen gebruiken"
+
+#~ msgid "Open Registration"
+#~ msgstr "Open registratie"
+
+#~ msgid "Save"
+#~ msgstr "Opslaan"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s en %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s en %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "is aan het typen…"
+#~ msgstr[1] "zijn aan het typen…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "is gestopt met typen"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i zoekresultaten"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Zichtbaarheid van JID’s"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Wie mag de JID’s van de deelnemers zien?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Paswoord voor groepsgesprek, indien nodig"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Verbinden met %s mislukt"
 
diff --git a/main/po/oc.po b/main/po/oc.po
index 7791ba28..51dfcbec 100644
--- a/main/po/oc.po
+++ b/main/po/oc.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-30 22:50+0000\n"
-"Last-Translator: Quentí <quentinantonin@free.fr>\n"
 "Language-Team: none\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "La benvenguda a Dino !"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Connectatz-vos o creatz un compte per començar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurar lo compte"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "I a pas cap de compte actiu"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gerir los comptes"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Cap de discussion activa"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Començar la discussion"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Rejónher una sala"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Uèi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ièr"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Telecargament %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s a ofrit : %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fichièr ofrit : %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fichièr ofrit"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Fracàs del transferiment de fichièr"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Lo messatge es tròp long"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Acceptar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Regetar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Aqueste contacte volriá vos ajustar a sa lista de contactes"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Pas chifrat"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fa %i minuta"
+msgstr[1] "fa %i minutas"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Ara meteis"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imatge enviat"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fichièr enviat"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imatge recebuda"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fichièr recebut"
 
@@ -42,16 +227,6 @@ msgstr "Fichièr recebut"
 msgid "Subscription request"
 msgstr "Demanda d’abonament"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Acceptar"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Regetar"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +265,7 @@ msgstr "Seleccionar"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +315,8 @@ msgstr "Se connectar a %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Podètz ara començar d’utilizar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Lo servidor requesís una inscripcion via lo site web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Inscripcion dubèrtas"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +360,12 @@ msgstr "Se marcar"
 msgid "Check %s for information on how to sign up"
 msgstr "Consultatz %s per mai d’informacions tocant cossí se marchar"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ieu"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ièr"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "fa %i minuta"
-msgstr[1] "fa %i minutas"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Ara meteis"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Rejónher una sala"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +373,16 @@ msgstr "Rejónher una sala"
 msgid "Join"
 msgstr "Rejónher"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Ajustar"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Enregistrar"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +397,6 @@ msgstr "Seguent"
 msgid "Back"
 msgstr "Tornar"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Començar la discussion"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Començar"
@@ -312,124 +433,6 @@ msgstr "Causissètz un escais-nom diferent"
 msgid "Too many occupants in room"
 msgstr "Tròp de participants a la sala"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "La benvenguda a Dino !"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Connectatz-vos o creatz un compte per començar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurar lo compte"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "I a pas cap de compte actiu"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gerir los comptes"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Cap de discussion activa"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Telecargament %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s a ofrit : %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fichièr ofrit : %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fichièr ofrit"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Fracàs del transferiment de fichièr"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Uèi"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s e %i autres"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "es a escriure…"
-msgstr[1] "son a escriure…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "a quitat d‘escriure"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Lo messatge es tròp long"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Aqueste contacte volriá vos ajustar a sa lista de contactes"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Proprietari"
@@ -465,8 +468,10 @@ msgstr "Expulsar"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i resultats de recèrca"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +517,12 @@ msgid "Occupants may change the subject"
 msgstr "Los ocupants pòdon cambiar lo subjècte"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descobèrta dels JID reals"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Qual pòt descobrir los JID reals ?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +533,8 @@ msgid "Password"
 msgstr "Senhal"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Senhal requesit per dintrar a la sala, se cal"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -624,6 +629,10 @@ msgstr "Cercar de messatges"
 msgid "Members"
 msgstr "Membres"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "M’avisar quand un nòu messatge arriba"
@@ -689,10 +698,6 @@ msgstr "Tot es prèst !"
 msgid "Finish"
 msgstr "Terminar"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Pas chifrat"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Acorchis clavièr"
@@ -793,10 +798,53 @@ msgstr "Verificatz l’ortografia o ensajatz de suprimir de filtres"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Clicatz aquí per començar una conversacion o jónher una sala."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Avètz pas cap conversacion dobèrta"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s e %i autres"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Podètz ara començar d’utilizar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Inscripcion dubèrtas"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrar"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s e %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s e %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "es a escriure…"
+#~ msgstr[1] "son a escriure…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "a quitat d‘escriure"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i resultats de recèrca"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descobèrta dels JID reals"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Qual pòt descobrir los JID reals ?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Senhal requesit per dintrar a la sala, se cal"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Fracàs de la connexion a %s"
 
diff --git a/main/po/pl.po b/main/po/pl.po
index d25bdb56..21b1af03 100644
--- a/main/po/pl.po
+++ b/main/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-28 23:24+0000\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/translations/"
 "pl/>\n"
@@ -19,23 +19,210 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Witaj w Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Zaloguj się lub załóż konto, aby rozpocząć."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Załóż konto"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Brak aktywnych kont"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Zarządzaj kontami"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Brak aktywnych rozmów"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Rozpocznij rozmowę"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Dołącz do kanału"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Pobieranie %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s zaoferowane: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Oferta pliku: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Oferta pliku"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Przesyłanie pliku nie powiodło się"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Za długa wiadomość"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Odmów"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ten kontakt chciałby dodać ciebie do swoich kontaktów"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Bez szyfrowania"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minuta temu"
+msgstr[1] "%i minuty temu"
+msgstr[2] "%i minut temu"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Przed chwilą"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Wysłano obraz"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Wysłano plik"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Odebrano obraz"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Odebrano plik"
 
@@ -43,16 +230,6 @@ msgstr "Odebrano plik"
 msgid "Subscription request"
 msgstr "Prośba o subskrypcję"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Odmów"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +268,7 @@ msgstr "Wybierz"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +318,8 @@ msgstr "Zaloguj się do %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Możesz teraz używać konto %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +351,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Serwer wymaga rejestracji przez stronę internetową"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Otwórz stronę"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,56 +363,12 @@ msgstr "Zarejestruj się"
 msgid "Check %s for information on how to sign up"
 msgstr "Dowiedz się na %s, jak się zarejestrować"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ja"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Wczoraj"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minuta temu"
-msgstr[1] "%i minuty temu"
-msgstr[2] "%i minut temu"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Przed chwilą"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Dołącz do kanału"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -242,20 +376,16 @@ msgstr "Dołącz do kanału"
 msgid "Join"
 msgstr "Dołącz"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s z %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Dodaj"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Zapisz"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -270,14 +400,6 @@ msgstr "Dalej"
 msgid "Back"
 msgstr "Wstecz"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Rozpocznij rozmowę"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Rozpocznij"
@@ -314,125 +436,6 @@ msgstr "Wybierz inny nick"
 msgid "Too many occupants in room"
 msgstr "Zbyt wielu osób w pokoju"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Witaj w Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Zaloguj się lub załóż konto, aby rozpocząć."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Załóż konto"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Brak aktywnych kont"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Zarządzaj kontami"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Brak aktywnych rozmów"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Pobieranie %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s zaoferowane: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Oferta pliku: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Oferta pliku"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Przesyłanie pliku nie powiodło się"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Dzisiaj"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s i %i innych"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s i %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s i %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "pisze…"
-msgstr[1] "piszą…"
-msgstr[2] "piszą…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "przestał pisać"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Za długa wiadomość"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Ten kontakt chciałby dodać ciebie do swoich kontaktów"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Właściciel"
@@ -468,8 +471,11 @@ msgstr "Wyrzuć"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i wyniki wyszukiwania"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -515,12 +521,12 @@ msgid "Occupants may change the subject"
 msgstr "Zmiana tematu możliwa przez użytkowników"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Uprawnienie do wyświetlenia JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Kto może widzieć JID użytkowników?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -531,8 +537,8 @@ msgid "Password"
 msgstr "Hasło"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Hasło, aby ograniczyć dostęp do pokoju"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +631,10 @@ msgstr "Wyszukaj wiadomości"
 msgid "Members"
 msgstr "Członkowie"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Powiadom, gdy nadejdzie wiadomość"
@@ -690,10 +700,6 @@ msgstr "Wszystko gotowe!"
 msgid "Finish"
 msgstr "Zakończ"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Bez szyfrowania"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
@@ -793,10 +799,54 @@ msgstr "Sprawdź pisownię lub spróbuj usunąć filtry"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Kliknij tutaj, aby rozpocząć rozmowę albo dołączyć do kanału."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Nie masz otwartych czatów"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s i %i innych"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Możesz teraz używać konto %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Otwórz stronę"
+
+#~ msgid "Save"
+#~ msgstr "Zapisz"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s i %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s i %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "pisze…"
+#~ msgstr[1] "piszą…"
+#~ msgstr[2] "piszą…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "przestał pisać"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i wyniki wyszukiwania"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Uprawnienie do wyświetlenia JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Kto może widzieć JID użytkowników?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Hasło, aby ograniczyć dostęp do pokoju"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Nie udało się połączyć z %s"
 
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 28e17794..c7faca24 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-16 00:21+0000\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/dino/"
 "translations/pt_BR/>\n"
@@ -17,23 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Seja bem vindo ao Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Entre ou crie uma conta para começar."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurar a conta"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Nenhuma conta ativa"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Gerenciar contas"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Nenhuma conversa ativa"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Iniciar conversa"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Juntar-se a um canal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoje"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Fazendo download de %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ofereceu: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Arquivo oferecido: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Arquivo oferecido"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferência de arquivo falhou"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensagem muito longa"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Aceitar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Negar"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Este contato gostaria de adicioná-lo à sua lista de contatos"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Não-criptografado"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min atrás"
+msgstr[1] "%i min atrás"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Agora há pouco"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imagem enviada"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Arquivo enviado"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imagem recebida"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Arquivo recebido"
 
@@ -41,16 +227,6 @@ msgstr "Arquivo recebido"
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Aceitar"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Negar"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -89,6 +265,7 @@ msgstr "Selecionar"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -138,8 +315,8 @@ msgstr "Registrar-se em %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Agora você pode começar a usar %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -171,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "O servidor requer que se inscreva através de um site"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Abrir Site de Inscrição"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -183,55 +360,12 @@ msgstr "Registrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Verifique %s para informação de como se inscrever"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ontem"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min atrás"
-msgstr[1] "%i min atrás"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Agora há pouco"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Juntar-se a um canal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -239,20 +373,16 @@ msgstr "Juntar-se a um canal"
 msgid "Join"
 msgstr "Juntar-se"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Adicionar"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Salvar"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -267,14 +397,6 @@ msgstr "Próximo"
 msgid "Back"
 msgstr "Voltar"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar conversa"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Iniciar"
@@ -311,124 +433,6 @@ msgstr "Escolha um apelido diferente"
 msgid "Too many occupants in room"
 msgstr "Número máximo da sala"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Seja bem vindo ao Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Entre ou crie uma conta para começar."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurar a conta"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Nenhuma conta ativa"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Gerenciar contas"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Nenhuma conversa ativa"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Fazendo download de %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s ofereceu: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Arquivo oferecido: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Arquivo oferecido"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Transferência de arquivo falhou"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Hoje"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s e outros %i"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s e %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "está digitando…"
-msgstr[1] "estão digitando…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "parou de digitar"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mensagem muito longa"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Este contato gostaria de adicioná-lo à sua lista de contatos"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Dono"
@@ -464,8 +468,10 @@ msgstr "Kick"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i resultado(s) da busca"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -511,12 +517,12 @@ msgid "Occupants may change the subject"
 msgstr "Integrantes podem mudar o assunto"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descobrir JIDs reais"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Quem pode encontrar JIDs reais?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -527,8 +533,8 @@ msgid "Password"
 msgstr "Senha"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Senha requerida para entrar na sala, se houver"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -621,6 +627,10 @@ msgstr "Buscar mensagens"
 msgid "Members"
 msgstr "Membros"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar quando uma nova mensagem chegar"
@@ -686,10 +696,6 @@ msgstr "Tudo configurado!"
 msgid "Finish"
 msgstr "Finalizado"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Não-criptografado"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
@@ -790,10 +796,53 @@ msgstr "Verifique a grafia ou tente remover filtros"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Clique aqui para inicial uma conversa or entrar em um canal."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Você não tem conversas abertas"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s e outros %i"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Agora você pode começar a usar %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Abrir Site de Inscrição"
+
+#~ msgid "Save"
+#~ msgstr "Salvar"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s e %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s e %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "está digitando…"
+#~ msgstr[1] "estão digitando…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "parou de digitar"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i resultado(s) da busca"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descobrir JIDs reais"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Quem pode encontrar JIDs reais?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Senha requerida para entrar na sala, se houver"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Falha ao se conectar com %s"
 
diff --git a/main/po/ro.po b/main/po/ro.po
index 918e7cb8..34765570 100644
--- a/main/po/ro.po
+++ b/main/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-01-12 13:21+0000\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/"
 "translations/ro/>\n"
@@ -19,23 +19,210 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10.1\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Bine ați venit la Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Autentificați-vă sau creați un cont pentru a începe."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Configurare cont"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Nici un cont activ"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Administrare conturi"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Nici o conversație activă"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Pornește o conversație"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Alăturați-vă canalului"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Azi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Ieri"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Se descarcă %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s a oferit: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fișier oferit: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fișier oferit"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferul fișierului a eșuat"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mesaj prea lung"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Acceptă"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Refuză"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Acest contact dorește să vă adauge la lista ei/lui de contacte"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Necriptat"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Acum %i minut"
+msgstr[1] "Acum %i minute"
+msgstr[2] "Acum %i de minute"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Chiar acum"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Imagine trimisă"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fișier trimis"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Imagine primitä"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fișier primit"
 
@@ -43,16 +230,6 @@ msgstr "Fișier primit"
 msgid "Subscription request"
 msgstr "Cerere de abonare"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Acceptă"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Refuză"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +268,7 @@ msgstr "Selectare"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +318,8 @@ msgstr "Autentificare în %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Acum puteți utiliza %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +351,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Serverul necesită înregistrarea printr-un site web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Deschis pentru înregistrare"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,56 +363,12 @@ msgstr "Înregistrează-te"
 msgid "Check %s for information on how to sign up"
 msgstr "Aflați pe %s informații despre cum se face înregistrarea"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Ieri"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "Acum %i minut"
-msgstr[1] "Acum %i minute"
-msgstr[2] "Acum %i de minute"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Chiar acum"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Alăturați-vă canalului"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -242,20 +376,16 @@ msgstr "Alăturați-vă canalului"
 msgid "Join"
 msgstr "Alăturați-vă"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s de la %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Adaugă"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Salvare"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -270,14 +400,6 @@ msgstr "Următorul"
 msgid "Back"
 msgstr "Înapoi"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Pornește o conversație"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Pornire"
@@ -314,125 +436,6 @@ msgstr "Alegeți un nume diferit"
 msgid "Too many occupants in room"
 msgstr "Discuția are prea mulți membrii"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Bine ați venit la Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Autentificați-vă sau creați un cont pentru a începe."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Configurare cont"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Nici un cont activ"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Administrare conturi"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Nici o conversație activă"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Se descarcă %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s a oferit: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fișier oferit: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fișier oferit"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Transferul fișierului a eșuat"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Azi"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s și încă %i alții"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s și %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s și %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "tastează…"
-msgstr[1] "tastează…"
-msgstr[2] "tastează…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "s-a oprit din scris"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mesaj prea lung"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Acest contact dorește să vă adauge la lista ei/lui de contacte"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Proprietar"
@@ -468,8 +471,11 @@ msgstr "Dă afară"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i rezultate la căutare"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -515,12 +521,12 @@ msgid "Occupants may change the subject"
 msgstr "Membrii pot schimba subiectul"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Descoperă adresele adevărate"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Cine poate descoperi adresele adevărate?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -531,8 +537,8 @@ msgid "Password"
 msgstr "Parolă"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Dacă există, o parolă va fi necesară pentru alăturarea la discuție"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -625,6 +631,10 @@ msgstr "Caută mesaje"
 msgid "Members"
 msgstr "Membri"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifică atunci când este primit un mesaj nou"
@@ -690,10 +700,6 @@ msgstr "Gata!"
 msgid "Finish"
 msgstr "Finalizare"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Necriptat"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Scurtături de tastatură"
@@ -794,10 +800,54 @@ msgstr "Verificați ortografia sau încercați să eliminați filtre"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Apăsați aici pentru a porni o conversație sau a vă alătura unui canal."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Nu aveți nici o discuție deschisă"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s și încă %i alții"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Acum puteți utiliza %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Deschis pentru înregistrare"
+
+#~ msgid "Save"
+#~ msgstr "Salvare"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s și %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s și %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "tastează…"
+#~ msgstr[1] "tastează…"
+#~ msgstr[2] "tastează…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "s-a oprit din scris"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i rezultate la căutare"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Descoperă adresele adevărate"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Cine poate descoperi adresele adevărate?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Dacă există, o parolă va fi necesară pentru alăturarea la discuție"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Eroare la conectarea cu %s"
 
diff --git a/main/po/ru.po b/main/po/ru.po
index 68ba2c12..2cf471e2 100644
--- a/main/po/ru.po
+++ b/main/po/ru.po
@@ -7,36 +7,222 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
-"Last-Translator: OIS <mistresssilvara@hotmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/"
 "translations/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Добро пожаловать в Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Вопийте или создавайте учетную запись, чтобы начать."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Настроить учётную запись"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Нет активных аккаунтов"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Управление аккаунтами"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Нет активных чатов"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Начать чат"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Войти в канал"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Сегодня"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Вчера"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Скачивается %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s предложил: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Предложен файл: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Предложен файл"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Ошибка передачи файла"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Сообщение слишком длинное"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Принять"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Отклонить"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Этот контакт хочет добавить вас в список контактов"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Не шифровать"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i минуту назад"
+msgstr[1] "%i минут назад"
+msgstr[2] "%i минут назад"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Только что"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Изображение отправлено"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Файл отправлен"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Получено изображение"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Получен файл"
 
@@ -44,16 +230,6 @@ msgstr "Получен файл"
 msgid "Subscription request"
 msgstr "Требуется авторизация"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Принять"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Отклонить"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -92,6 +268,7 @@ msgstr "Выбрать"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -141,8 +318,8 @@ msgstr "Вход в %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Теперь вы можете использовать %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -174,8 +351,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Сервер требует авторизацию через сайт"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Открытая регистрация"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -186,56 +363,12 @@ msgstr "Зарегистрироваться"
 msgid "Check %s for information on how to sign up"
 msgstr "Прочтите %s, чтобы узнать о процессе авторизации"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Я"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Вчера"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i минуту назад"
-msgstr[1] "%i минут назад"
-msgstr[2] "%i минут назад"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Только что"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Войти в канал"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -243,20 +376,16 @@ msgstr "Войти в канал"
 msgid "Join"
 msgstr "Войти"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s из %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Добавить"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Сохранить"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -271,14 +400,6 @@ msgstr "Следующее"
 msgid "Back"
 msgstr "Назад"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Начать чат"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Начать"
@@ -315,125 +436,6 @@ msgstr "Выберите другой никнейм"
 msgid "Too many occupants in room"
 msgstr "Слишком много посетителей в комнате"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Добро пожаловать в Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Вопийте или создавайте учетную запись, чтобы начать."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Настроить учётную запись"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Нет активных аккаунтов"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Управление аккаунтами"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Нет активных чатов"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Скачивается %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s предложил: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Предложен файл: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Предложен файл"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Ошибка передачи файла"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Сегодня"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s и ещё %i человек"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s и %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s и %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "печатает…"
-msgstr[1] "печатают…"
-msgstr[2] "печатают…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "перестал печатать"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Сообщение слишком длинное"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Этот контакт хочет добавить вас в список контактов"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Владелец"
@@ -469,8 +471,11 @@ msgstr "Выгнать"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "Результаты поиска по запросу «%i»"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -516,12 +521,12 @@ msgid "Occupants may change the subject"
 msgstr "Посетители могут менять тему"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Показывать настоящие JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Кто может видеть настоящие JID?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -532,8 +537,8 @@ msgid "Password"
 msgstr "Пароль"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Требуется пароль для входа в комнату, если"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -626,6 +631,10 @@ msgstr "Найти сообщения"
 msgid "Members"
 msgstr "Участники"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Уведомлять о новых сообщениях"
@@ -691,10 +700,6 @@ msgstr "Настройка завершена!"
 msgid "Finish"
 msgstr "Закончить"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Не шифровать"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Горячие Клавиши"
@@ -794,10 +799,54 @@ msgstr "Проверьте словари или попробуйте измен
 msgid "Click here to start a conversation or join a channel."
 msgstr "Нажмите здесь, чтобы начать разговор или присоединиться к каналу."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "У вас нет открытых чатов"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s и ещё %i человек"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Теперь вы можете использовать %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Открытая регистрация"
+
+#~ msgid "Save"
+#~ msgstr "Сохранить"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s и %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s и %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "печатает…"
+#~ msgstr[1] "печатают…"
+#~ msgstr[2] "печатают…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "перестал печатать"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "Результаты поиска по запросу «%i»"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Показывать настоящие JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Кто может видеть настоящие JID?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Требуется пароль для входа в комнату, если"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Не удалось соединение с %s"
 
diff --git a/main/po/sv.po b/main/po/sv.po
index 657c6f02..a6142f5c 100644
--- a/main/po/sv.po
+++ b/main/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2019-12-26 23:21+0000\n"
 "Language-Team: none\n"
 "Language: sv\n"
@@ -17,23 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Välkommen till Dino!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Logga in eller skapa ett konto för att komma igång."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Ställ in konto"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Inga aktiva konton"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Hantera konton"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Inga aktiva chattar"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Starta Chatt"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Anslut till kanal"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "I dag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "I går"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a %d %b"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Tar emot %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s erbjöd: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Fil erbjuden: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Fil erbjuden"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Filöverföring misslyckades"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Meddelandet är för långt"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Godkänn"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Neka"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Denna kontakt vill lägga till dig i sin kontaktlista"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Okrypterat"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minut sedan"
+msgstr[1] "%i minuter sedan"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Nyss"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Bild skickad"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Fil skickad"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Bild mottagen"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Fil mottagen"
 
@@ -41,16 +227,6 @@ msgstr "Fil mottagen"
 msgid "Subscription request"
 msgstr "Prenumerationsförfrågan"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Godkänn"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Neka"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -89,6 +265,7 @@ msgstr "Välj"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -138,8 +315,8 @@ msgstr "Logga in på %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Du kan nu börja använda %s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -171,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Servern kräver registrering genom en webbsida"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Öppna Registreringen"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -183,55 +360,12 @@ msgstr "Registrera"
 msgid "Check %s for information on how to sign up"
 msgstr "Kolla %s för information om registrering"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Jag"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "I går"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minut sedan"
-msgstr[1] "%i minuter sedan"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Nyss"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Anslut till kanal"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -239,20 +373,16 @@ msgstr "Anslut till kanal"
 msgid "Join"
 msgstr "Anslut"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s från %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Lägg till"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Spara"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -267,14 +397,6 @@ msgstr "Nästa"
 msgid "Back"
 msgstr "Tillbaka"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Starta Chatt"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Starta"
@@ -311,124 +433,6 @@ msgstr "Välj ett annat smeknamn"
 msgid "Too many occupants in room"
 msgstr "För många användare i rummet"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Välkommen till Dino!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Logga in eller skapa ett konto för att komma igång."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Ställ in konto"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Inga aktiva konton"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Hantera konton"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Inga aktiva chattar"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "Tar emot %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s erbjöd: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Fil erbjuden: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Fil erbjuden"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Filöverföring misslyckades"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "I dag"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a %d %b"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s och %i andra"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s och %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s och %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "skriver…"
-msgstr[1] "skriver…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "har slutat skriva"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Meddelandet är för långt"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Denna kontakt vill lägga till dig i sin kontaktlista"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Ägare"
@@ -464,8 +468,10 @@ msgstr "Kasta ut"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i sökresultat"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -511,12 +517,12 @@ msgid "Occupants may change the subject"
 msgstr "Besökare får ändra ämnet"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Upptäckt riktiga JID:n"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Vem får upptäcka riktiga JID:n?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -527,8 +533,8 @@ msgid "Password"
 msgstr "Lösenord"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Lösenord som krävs för tillträde, om något"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -621,6 +627,10 @@ msgstr "Sök meddelanden"
 msgid "Members"
 msgstr "Medlemmar"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Avisera när ett nytt meddelande mottages"
@@ -686,10 +696,6 @@ msgstr "Färdigt!"
 msgid "Finish"
 msgstr "Slutför"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Okrypterat"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Snabbkommandon"
@@ -790,10 +796,53 @@ msgstr "Kolla stavningen eller ta bort filter"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Klicka här för att starta en konversation eller gå med i en kanal."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Du har inga öppna konversationer"
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s och %i andra"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Du kan nu börja använda %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "Öppna Registreringen"
+
+#~ msgid "Save"
+#~ msgstr "Spara"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s och %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s och %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "skriver…"
+#~ msgstr[1] "skriver…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "har slutat skriva"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i sökresultat"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Upptäckt riktiga JID:n"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Vem får upptäcka riktiga JID:n?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Lösenord som krävs för tillträde, om något"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "Anslutning till %s misslyckades"
 
diff --git a/main/po/tr.po b/main/po/tr.po
index 92a6ffc3..6e357867 100644
--- a/main/po/tr.po
+++ b/main/po/tr.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
-"Last-Translator: Muha Aliss <muhaaliss@pm.me>\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -18,23 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "Dino'ya hoş geldin!"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "Başlamak için giriş yap ya da yeni bir hesap oluştur."
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "Hesap oluştur"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "Aktif hesap yok"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "Hesapları yönet"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "Aktif sohbet yok"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "Sohbete Başla"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanala katıl"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Bugün"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "Dün"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "İndiriliyor %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s teklif etti: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Dosya teklif edildi: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Dosya teklif edildi"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Dosya transferi başarısız"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mesaj çok uzun"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "Kabul et"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "Reddet"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Bu kişi seni kendi kişiler listesine eklemek istiyor"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Şifrelenmemiş"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i dakika önce"
+msgstr[1] "%i dakıka önce"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "Şu an"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "Resim gönderildi"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "Dosya gönderildi"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "Resim alındı"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "Dosya alındı"
 
@@ -42,16 +227,6 @@ msgstr "Dosya alındı"
 msgid "Subscription request"
 msgstr "Abonelik talebi"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "Kabul et"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "Reddet"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -90,6 +265,7 @@ msgstr "Seç"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -139,8 +315,8 @@ msgstr "%s'e giriş yap"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "Şimdi %s kullanmaya başlayabilirsin"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -172,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "Sunucu bir websitesine kayıt olmanı şart koşuyor"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "Açık Kaydolma"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -184,55 +360,12 @@ msgstr "Kayıt"
 msgid "Check %s for information on how to sign up"
 msgstr "Nasıl kaydolacağınızla ilgili bilgi için %s sayfasına bakın"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "Ben"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "Dün"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i dakika önce"
-msgstr[1] "%i dakıka önce"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "Şu an"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "Kanala katıl"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +373,16 @@ msgstr "Kanala katıl"
 msgid "Join"
 msgstr "Katıl"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr "%s - %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "Ekle"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Kaydet"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +397,6 @@ msgstr "İleri"
 msgid "Back"
 msgstr "Geri"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Sohbete Başla"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Başla"
@@ -312,124 +433,6 @@ msgstr "Başka bir takma isim seçin"
 msgid "Too many occupants in room"
 msgstr "Odada çok fazla kullanıcı var"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "Dino'ya hoş geldin!"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "Başlamak için giriş yap ya da yeni bir hesap oluştur."
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "Hesap oluştur"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "Aktif hesap yok"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "Hesapları yönet"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "Aktif sohbet yok"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "İndiriliyor %s…"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr "%s teklif etti: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr "Dosya teklif edildi: %s"
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr "Dosya teklif edildi"
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "Dosya transferi başarısız"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "Bugün"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a, %b %d"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s, %s ve %i diğerleri"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s, %s ve %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s ve %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "yazıyor…"
-msgstr[1] "yazıyorlar…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "yazmayı sonlandırdı"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "Mesaj çok uzun"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "Bu kişi seni kendi kişiler listesine eklemek istiyor"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "Sahip"
@@ -465,8 +468,10 @@ msgstr "Kov"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i adet sonuc bulundu"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -512,12 +517,12 @@ msgid "Occupants may change the subject"
 msgstr "Kişiler başlığı değiştirebilir"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "Gerçek JIDs keşfetme"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "Kimler gerçek JIDs keşfedebilir?"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -528,8 +533,8 @@ msgid "Password"
 msgstr "Parola"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "Odaya giriş için yapmak için parola ( gerekirse )"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -622,6 +627,10 @@ msgstr "Mesajları ara"
 msgid "Members"
 msgstr "Üyeler"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Mesaj ulaştığında bildirim gönder"
@@ -687,10 +696,6 @@ msgstr "Hepsi tamam!"
 msgid "Finish"
 msgstr "Bitir"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Şifrelenmemiş"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
@@ -791,6 +796,49 @@ msgstr "Yazım hatalarını kontrol et ya da filtreleri kaldırmayı dene"
 msgid "Click here to start a conversation or join a channel."
 msgstr "Bir sohbet başlatmak ya da kanala katılmak için buraya tıkla."
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr "Henüz burada sohbet yok"
+
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s, %s ve %i diğerleri"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "Şimdi %s kullanmaya başlayabilirsin"
+
+#~ msgid "Open Registration"
+#~ msgstr "Açık Kaydolma"
+
+#~ msgid "Save"
+#~ msgstr "Kaydet"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s, %s ve %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s ve %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "yazıyor…"
+#~ msgstr[1] "yazıyorlar…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "yazmayı sonlandırdı"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i adet sonuc bulundu"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "Gerçek JIDs keşfetme"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "Kimler gerçek JIDs keşfedebilir?"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "Odaya giriş için yapmak için parola ( gerekirse )"
diff --git a/main/po/zh_CN.po b/main/po/zh_CN.po
index ddee6e7d..ae137591 100644
--- a/main/po/zh_CN.po
+++ b/main/po/zh_CN.po
@@ -7,9 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
 "PO-Revision-Date: 2020-02-09 02:50+0000\n"
-"Last-Translator: Sak94664 <hdudhhhdh@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "dino/translations/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -19,23 +18,208 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "欢迎来到 Dino！"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "登录或者创建一个账户后开始。"
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "设置帐户"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "没有激活的帐号"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "管理帐号"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "没有活动的会话"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "开始聊天"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "加入频道"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "昨天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a，%b%d日"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%_m 月 %_d 日"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "正在下载 %s …"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "文件传输失败"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "消息太长"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
+msgid "Accept"
+msgstr "接受"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
+msgid "Deny"
+msgstr "拒绝"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "该联系人想把你加到他们的联系人列表"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x，%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%_m 月 %_d 日，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%_m 月 %_d 日，%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%A，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%A，%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分钟以前"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "刚刚"
+
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "Image sent"
 msgstr "图片已发送"
 
 #: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
 msgid "File sent"
 msgstr "文件已发送"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "Image received"
 msgstr "图片已接收"
 
 #: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
 msgid "File received"
 msgstr "文件已接收"
 
@@ -43,16 +227,6 @@ msgstr "文件已接收"
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
-msgid "Accept"
-msgstr "接受"
-
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
-msgid "Deny"
-msgstr "拒绝"
-
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
@@ -91,6 +265,7 @@ msgstr "选择"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -140,8 +315,8 @@ msgstr "登录到%s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
-msgstr "您现在可以开始使用%s"
+msgid "You can now start using the account %s"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
@@ -173,8 +348,8 @@ msgid "The server requires to sign up through a website"
 msgstr "服务器要求在网站上注册"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
-msgstr "开放注册"
+msgid "Open website"
+msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
@@ -185,54 +360,12 @@ msgstr "注册"
 msgid "Check %s for information on how to sign up"
 msgstr "检查 %s 以获取如何注册的信息"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
 msgstr "我"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr "%_m 月 %_d 日"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr "昨天"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分钟以前"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr "刚刚"
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr "加入频道"
-
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
@@ -240,20 +373,16 @@ msgstr "加入频道"
 msgid "Join"
 msgstr "加入"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
 msgstr "添加"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "保存"
-
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
 #: main/data/manage_accounts/add_account_dialog.ui:99
@@ -268,14 +397,6 @@ msgstr "下一个"
 msgid "Back"
 msgstr "返回"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "开始聊天"
-
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "开始"
@@ -312,123 +433,6 @@ msgstr "选择一个不同的昵称"
 msgid "Too many occupants in room"
 msgstr "房间内人数过多"
 
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr "欢迎来到 Dino！"
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr "登录或者创建一个账户后开始。"
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr "设置帐户"
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr "没有激活的帐号"
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr "管理帐号"
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr "没有活动的会话"
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr "正在下载 %s …"
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr "文件传输失败"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr "今天"
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr "%a，%b%d日"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr "%s、%s 以及 %i 个其他人"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr "%s、%s 和 %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr "%s 和 %s"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] "正在输入…"
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr "已经停止输入"
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr "消息太长"
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr "该联系人想把你加到他们的联系人列表"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x，%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x，%l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%_m 月 %_d 日，%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%_m 月 %_d 日，%l∶%M %p"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%A，%H∶%M"
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%A，%l∶%M %p"
-
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
 msgstr "所有者"
@@ -464,8 +468,9 @@ msgstr "踢出"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr "%i 搜索结果"
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
@@ -511,12 +516,12 @@ msgid "Occupants may change the subject"
 msgstr "参与者可以更改主题"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
-msgstr "发现真实 JID"
+msgid "Permission to view JIDs"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
-msgstr "谁可能发现真实 JID？"
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
 #: main/data/manage_accounts/dialog.ui:170
@@ -527,8 +532,8 @@ msgid "Password"
 msgstr "密码"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
-msgstr "如果有的话需要密码才能进入房间"
+msgid "A password to restrict access to the room"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -621,6 +626,10 @@ msgstr "搜索消息"
 msgid "Members"
 msgstr "成员"
 
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "新消息到达时通知"
@@ -686,10 +695,6 @@ msgstr "都准备好了！"
 msgid "Finish"
 msgstr "完成"
 
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "未加密"
-
 #: main/data/menu_app.ui:17
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
@@ -786,10 +791,52 @@ msgstr "检查拼写或尝试移除过滤器"
 msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
 msgstr ""
 
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s、%s 以及 %i 个其他人"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "您现在可以开始使用%s"
+
+#~ msgid "Open Registration"
+#~ msgstr "开放注册"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s、%s 和 %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s 和 %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "正在输入…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "已经停止输入"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i 搜索结果"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "发现真实 JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "谁可能发现真实 JID？"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "如果有的话需要密码才能进入房间"
+
 #~ msgid "Failed connecting to %s"
 #~ msgstr "连接 %s 失败"
 
diff --git a/main/po/zh_TW.po b/main/po/zh_TW.po
index a8c40385..afff3b76 100644
--- a/main/po/zh_TW.po
+++ b/main/po/zh_TW.po
@@ -7,138 +7,314 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-29 00:32+0100\n"
-"PO-Revision-Date: 2019-12-21 12:21+0000\n"
+"POT-Creation-Date: 2020-04-11 00:00+0200\n"
+"PO-Revision-Date: 2020-04-04 01:18+0000\n"
 "Language-Team: none\n"
-"Language: zh_Hant\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.0-dev\n"
 
-#: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
-msgid "Image sent"
+#: main/src/ui/main_window.vala:200
+msgid "Welcome to Dino!"
+msgstr "歡迎來到 Dino！"
+
+#: main/src/ui/main_window.vala:201
+msgid "Sign in or create an account to get started."
+msgstr "開始前請先登入或建立一個帳號。"
+
+#: main/src/ui/main_window.vala:202
+msgid "Set up account"
+msgstr "設定帳號"
+
+#: main/src/ui/main_window.vala:210
+msgid "No active accounts"
+msgstr "没有啟用的帳號"
+
+#: main/src/ui/main_window.vala:211
+msgid "Manage accounts"
+msgstr "管理帳號"
+
+#: main/src/ui/main_window.vala:220
+msgid "No active conversations"
+msgstr "没有進行中的對話"
+
+#: main/src/ui/main_window.vala:221
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
+#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
+msgid "Start Conversation"
+msgstr "開始對話"
+
+#: main/src/ui/main_window.vala:222 main/src/ui/application.vala:192
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "加入頻道"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:316
+msgid "Yesterday"
+msgstr "昨天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b%d日，%A"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:312
+#, no-c-format
+msgid "%b %d"
+msgstr "%b%d日"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "正在下載 %s …"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "分享了 %s：%s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "分享了檔案：%s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "分享了檔案"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "檔案傳送失敗"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing"
 msgstr ""
 
-#: main/src/ui/notifications.vala:66
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:166
-msgid "File sent"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
-msgid "Image received"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/src/ui/notifications.vala:68
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:168
-msgid "File received"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/src/ui/notifications.vala:98
-msgid "Subscription request"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "訊息太長"
+
+#: main/src/ui/conversation_content_view/message_widget.vala:184
+msgid "edited"
 msgstr ""
 
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:105 main/src/ui/notifications.vala:140
-#: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
-msgstr ""
+msgstr "同意"
 
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:139
-#: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
+msgstr "拒絕"
+
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "此聯絡人想把您新增到他們的聯絡人清單"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
 msgstr ""
 
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x，%p%l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b%d日，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b%d日，%p%l:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%A，%H∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%A，%p%l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:319
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:320
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%p%l∶%M"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:323
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分鐘前"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:325
+msgid "Just now"
+msgstr "剛才"
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
+msgid "Image sent"
+msgstr "影像已傳送"
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:193
+msgid "File sent"
+msgstr "檔案已傳送"
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
+msgid "Image received"
+msgstr "影像已接收"
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:195
+msgid "File received"
+msgstr "檔案已接收"
+
+#: main/src/ui/notifications.vala:98
+msgid "Subscription request"
+msgstr "訂閱請求"
+
 #: main/src/ui/notifications.vala:112
 #: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:188
 #, c-format
 msgid "Could not connect to %s"
-msgstr ""
+msgstr "無法連線到 %s"
 
 #: main/src/ui/notifications.vala:128
 #, c-format
 msgid "Invitation to %s"
-msgstr ""
+msgstr "邀請加入 %s"
 
 #: main/src/ui/notifications.vala:129
 #, c-format
 msgid "%s invited you to %s"
-msgstr ""
+msgstr "%s 邀請您加入 %s"
 
 #: main/src/ui/manage_accounts/dialog.vala:125
 #, c-format
 msgid "Remove account %s?"
-msgstr ""
+msgstr "移除帳號 %s ？"
 
 #: main/src/ui/manage_accounts/dialog.vala:128
 msgid "Remove"
-msgstr ""
+msgstr "移除"
 
 #: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select avatar"
-msgstr ""
+msgstr "選取頭像照片"
 
 #: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
-msgstr ""
+msgstr "選取"
 
 #: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:15
 #: main/src/ui/add_conversation/add_conference_dialog.vala:122
 #: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/data/message_item_widget_edit_mode.ui:54
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: main/src/ui/manage_accounts/dialog.vala:159
 msgid "Images"
-msgstr ""
+msgstr "影像"
 
 #: main/src/ui/manage_accounts/dialog.vala:163
 msgid "All files"
-msgstr ""
+msgstr "所有檔案"
 
 #: main/src/ui/manage_accounts/dialog.vala:219
 msgid "Connecting…"
-msgstr ""
+msgstr "正在連線…"
 
 #: main/src/ui/manage_accounts/dialog.vala:221
 msgid "Connected"
-msgstr ""
+msgstr "已連線"
 
 #: main/src/ui/manage_accounts/dialog.vala:223
 msgid "Disconnected"
-msgstr ""
+msgstr "連線已斷開"
 
 #: main/src/ui/manage_accounts/dialog.vala:232
 msgid "Wrong password"
-msgstr ""
+msgstr "密碼錯誤"
 
 #: main/src/ui/manage_accounts/dialog.vala:234
 msgid "Invalid TLS certificate"
-msgstr ""
+msgstr "無效的 TLS 憑證"
 
 #: main/src/ui/manage_accounts/dialog.vala:237
 #: main/src/ui/manage_accounts/dialog.vala:239
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:82
 msgid "Add Account"
-msgstr ""
+msgstr "新增帳號"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
 msgid "Sign in to %s"
-msgstr ""
+msgstr "登入到 %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "You can now start using %s"
+msgid "You can now start using the account %s"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:263
@@ -147,110 +323,64 @@ msgstr ""
 #: main/src/ui/manage_accounts/add_account_dialog.vala:382
 #: main/src/ui/add_conversation/conference_details_fragment.vala:191
 msgid "Invalid address"
-msgstr ""
+msgstr "無效的位址"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:278
 msgid "Wrong username or password"
-msgstr ""
+msgstr "使用者名稱或密碼錯誤"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:281
 msgid "Something went wrong"
-msgstr ""
+msgstr "出現了錯誤"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:321
 msgid "No response from server"
-msgstr ""
+msgstr "伺服器没有回應"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:327
 #, c-format
 msgid "Register on %s"
-msgstr ""
+msgstr "在 %s 註冊"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:330
 msgid "The server requires to sign up through a website"
-msgstr ""
+msgstr "伺服器要求通過網頁進行註冊"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open Registration"
+msgid "Open website"
 msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:344
 msgid "Register"
-msgstr ""
+msgstr "註冊"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:346
 #, c-format
 msgid "Check %s for information on how to sign up"
-msgstr ""
+msgstr "查閱 %s 以取得關於如何註冊的資訊"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:146
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:160
-#: main/src/ui/util/helper.vala:136 main/src/ui/util/helper.vala:151
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:162
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:187
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
 msgid "Me"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:258
-#: main/src/ui/conversation_summary/date_separator_populator.vala:100
-#, no-c-format
-msgid "%b %d"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:262
-#: main/src/ui/conversation_summary/date_separator_populator.vala:91
-msgid "Yesterday"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:265
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:205
-#, no-c-format
-msgid "%H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:206
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:269
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:210
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:271
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:212
-msgid "Just now"
-msgstr ""
-
-#: main/src/ui/application.vala:192
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/src/ui/unified_window.vala:249 main/data/menu_add.ui:13
-#: main/data/shortcuts.ui:24
-msgid "Join Channel"
-msgstr ""
+msgstr "我"
 
 #: main/src/ui/application.vala:192
 #: main/src/ui/add_conversation/add_conference_dialog.vala:66
 #: main/src/ui/add_conversation/add_conference_dialog.vala:142
 #: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Join"
-msgstr ""
+msgstr "加入"
 
-#: main/src/ui/util/helper.vala:126
+#: main/src/ui/util/helper.vala:127
 #, c-format
 msgid "%s from %s"
-msgstr ""
+msgstr "%s 來自 %s"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:28
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:27
 #: main/data/add_conversation/add_contact_dialog.ui:24
 msgid "Add"
-msgstr ""
-
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr ""
+msgstr "新增"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -258,262 +388,138 @@ msgstr ""
 #: main/data/manage_accounts/add_account_dialog.ui:410
 #: main/data/manage_accounts/add_account_dialog.ui:490
 msgid "Next"
-msgstr ""
+msgstr "下一個"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:147
 #: main/data/manage_accounts/add_account_dialog.ui:175
 #: main/data/manage_accounts/add_account_dialog.ui:267
 msgid "Back"
-msgstr ""
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:97
-#: main/src/ui/unified_window.vala:248
-#: main/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:20 main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
+msgstr "返回"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
-msgstr ""
+msgstr "開始"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
-msgstr ""
+msgstr "正在加入…"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:169
 msgid "Password required to enter room"
-msgstr ""
+msgstr "需要密碼才能加入聊天室"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:174
 msgid "Banned from joining or creating conference"
-msgstr ""
+msgstr "被禁止加入或建立聊天室"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:176
 msgid "Room does not exist"
-msgstr ""
+msgstr "聊天室不存在"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:178
 msgid "Not allowed to create room"
-msgstr ""
+msgstr "不允許建立聊天室"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:180
 msgid "Members-only room"
-msgstr ""
+msgstr "聊天室不對外開放"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:183
 msgid "Choose a different nick"
-msgstr ""
+msgstr "選取一個不同的暱稱"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:185
 msgid "Too many occupants in room"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:227
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:228
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/unified_window.vala:229
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:237
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:238
-msgid "Manage accounts"
-msgstr ""
-
-#: main/src/ui/unified_window.vala:247
-msgid "No active conversations"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:275
-#, c-format
-msgid "Downloading %s…"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:281
-#, c-format
-msgid "%s offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:283
-#, c-format
-msgid "File offered: %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:285
-msgid "File offered"
-msgstr ""
-
-#: main/src/ui/conversation_summary/file_widget.vala:290
-msgid "File transfer failed"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:85
-msgid "Today"
-msgstr ""
-
-#: main/src/ui/conversation_summary/date_separator_populator.vala:98
-msgid "%a, %b %d"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:145
-#, c-format
-msgid "%s, %s and %i others"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:147
-#, c-format
-msgid "%s, %s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:149
-#, c-format
-msgid "%s and %s"
-msgstr ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:154
-msgid "is typing…"
-msgid_plural "are typing…"
-msgstr[0] ""
-
-#: main/src/ui/conversation_summary/chat_state_populator.vala:156
-msgid "has stopped typing"
-msgstr ""
-
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:59
-msgid "Message too long"
-msgstr ""
-
-#: main/src/ui/conversation_summary/subscription_notification.vala:48
-msgid "This contact would like to add you to their contact list"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:194
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:198
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr ""
-
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:202
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
+msgstr "聊天室人數過多"
 
 #: main/src/ui/occupant_menu/list.vala:102
 msgid "Owner"
-msgstr ""
+msgstr "擁有人"
 
 #: main/src/ui/occupant_menu/list.vala:104
 msgid "Admin"
-msgstr ""
+msgstr "管理員"
 
 #: main/src/ui/occupant_menu/list.vala:106
 msgid "Member"
-msgstr ""
+msgstr "成員"
 
 #: main/src/ui/occupant_menu/list.vala:108
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #: main/src/ui/occupant_menu/view.vala:29
 #: main/src/ui/occupant_menu/view.vala:38
 msgid "Invite"
-msgstr ""
+msgstr "邀請"
 
 #: main/src/ui/occupant_menu/view.vala:37
 msgid "Invite to Conference"
-msgstr ""
+msgstr "邀請加入聊天室"
 
 #: main/src/ui/occupant_menu/view.vala:88
 msgid "Start private conversation"
-msgstr ""
+msgstr "開始私人對話"
 
 #: main/src/ui/occupant_menu/view.vala:96
 msgid "Kick"
-msgstr ""
+msgstr "踢走"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
-msgid "%i search results"
-msgstr ""
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
 
 #: main/src/ui/global_search.vala:167
 #, c-format
 msgid "In %s"
-msgstr ""
+msgstr "在 %s"
 
 #: main/src/ui/global_search.vala:167
 #, c-format
 msgid "With %s"
-msgstr ""
+msgstr "和 %s"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
-msgstr ""
+msgstr "聊天室詳細情況"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
-msgstr ""
+msgstr "聯絡人詳細情況"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
-msgstr ""
+msgstr "聊天室名稱"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:53
 msgid "Description of the room"
-msgstr ""
+msgstr "聊天室介紹"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Persistent"
-msgstr ""
+msgstr "永久"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:57
 msgid "The room will persist after the last occupant leaves"
-msgstr ""
+msgstr "聊天室在最後一個成員離開後仍然存在"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Publicly searchable"
-msgstr ""
+msgstr "可被公開搜尋"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Occupants may change the subject"
-msgstr ""
+msgstr "成員可以變更主旨"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
-msgid "Discover real JIDs"
+msgid "Permission to view JIDs"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
-msgid "Who may discover real JIDs?"
+msgid "Who is allowed to view the occupants' JIDs?"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
@@ -522,185 +528,183 @@ msgstr ""
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
 msgid "Password"
-msgstr ""
+msgstr "密碼"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
-msgid "Password required for room entry, if any"
+msgid "A password to restrict access to the room"
 msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
-msgstr ""
+msgstr "發言"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:75
 msgid "Only occupants with voice may send messages"
-msgstr ""
+msgstr "僅限有發言權的成員可以傳送訊息"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Members only"
-msgstr ""
+msgstr "僅限會員"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:79
 msgid "Only members may enter the room"
-msgstr ""
+msgstr "只有會員才可以加入聊天室"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:82
 msgid "Message history"
-msgstr ""
+msgstr "訊息紀錄"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:83
 msgid "Maximum amount of backlog issued by the room"
-msgstr ""
+msgstr "聊天室儲存的訊息紀錄的最大數目"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:89
 msgid "Room Configuration"
-msgstr ""
+msgstr "聊天室設定"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 #: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
-msgstr ""
+msgstr "封鎖"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
-msgstr ""
+msgstr "雙向的通訊以及狀態更新被封鎖"
 
 #: main/src/ui/contact_details/settings_provider.vala:13
 msgid "Local Settings"
-msgstr ""
+msgstr "本地設定"
 
 #: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
-msgstr ""
+msgstr "傳送「正在輸入」提示"
 
 #: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
-msgstr ""
+msgstr "傳送已讀回條"
 
 #: main/src/ui/contact_details/settings_provider.vala:38
 #: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
-msgstr ""
+msgstr "通知"
 
 #: main/src/ui/contact_details/settings_provider.vala:82
 #: main/src/ui/contact_details/settings_provider.vala:122
 #: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
-msgstr ""
+msgstr "啟用"
 
 #: main/src/ui/contact_details/settings_provider.vala:84
 #: main/src/ui/contact_details/settings_provider.vala:122
 #: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
-msgstr ""
+msgstr "停用"
 
 #: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
-msgstr ""
+msgstr "僅限被提及時"
 
 #: main/src/ui/contact_details/settings_provider.vala:88
 #: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
-msgstr ""
+msgstr "預設：%s"
 
 #: main/src/ui/conversation_titlebar/search_entry.vala:11
 msgid "Search messages"
-msgstr ""
+msgstr "搜尋訊息"
 
 #: main/src/ui/conversation_titlebar/occupants_entry.vala:37
 msgid "Members"
+msgstr "成員"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
 msgstr ""
 
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
-msgstr ""
+msgstr "有新訊息時提醒"
 
 #: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
-msgstr ""
+msgstr "將文字表情轉換爲表情符號"
 
 #: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
 msgid "Accounts"
-msgstr ""
+msgstr "帳諕"
 
 #: main/data/manage_accounts/dialog.ui:200
 msgid "Local alias"
-msgstr ""
+msgstr "本地別名"
 
 #: main/data/manage_accounts/dialog.ui:255
 msgid "No accounts configured"
-msgstr ""
+msgstr "未有設定好的帳號"
 
 #: main/data/manage_accounts/dialog.ui:266
 msgid "Add an account"
-msgstr ""
+msgstr "新增帳號"
 
 #: main/data/manage_accounts/add_account_dialog.ui:31
 msgid "Sign in"
-msgstr ""
+msgstr "登入"
 
 #: main/data/manage_accounts/add_account_dialog.ui:78
 #: main/data/manage_accounts/add_account_dialog.ui:328
 msgid "Create account"
-msgstr ""
+msgstr "建立帳號"
 
 #: main/data/manage_accounts/add_account_dialog.ui:153
 msgid "Could not establish a secure connection"
-msgstr ""
+msgstr "無法建立安全連線"
 
 #: main/data/manage_accounts/add_account_dialog.ui:288
 msgid "Connect"
-msgstr ""
+msgstr "連線"
 
 #: main/data/manage_accounts/add_account_dialog.ui:340
 msgid "Choose a public server"
-msgstr ""
+msgstr "選取一個公眾伺服器"
 
 #: main/data/manage_accounts/add_account_dialog.ui:369
 msgid "Or specify a server address"
-msgstr ""
+msgstr "或指定一個伺服器位址"
 
 #: main/data/manage_accounts/add_account_dialog.ui:389
 msgid "Sign in instead"
-msgstr ""
+msgstr "登入"
 
 #: main/data/manage_accounts/add_account_dialog.ui:470
 msgid "Pick another server"
-msgstr ""
+msgstr "選取另一個伺服器"
 
 #: main/data/manage_accounts/add_account_dialog.ui:542
 msgid "All set up!"
-msgstr ""
+msgstr "準備好了！"
 
 #: main/data/manage_accounts/add_account_dialog.ui:578
 msgid "Finish"
-msgstr ""
-
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr ""
+msgstr "完成"
 
 #: main/data/menu_app.ui:17
-#, fuzzy
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵"
 
 #: main/data/menu_app.ui:21
-#, fuzzy
 msgid "About Dino"
 msgstr "關於 Dino"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr ""
+msgstr "現代化的 XMPP 聊天用戶端"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
@@ -708,6 +712,8 @@ msgid ""
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
+"Dino 是一個爲桌面打造的現代化的開放源始碼聊天用戶端。它致力於提供一個簡洁而可"
+"靠的 Jabber/XMPP 體驗，同時亦尊重您的隱私。"
 
 #: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
@@ -715,36 +721,38 @@ msgid ""
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
+"它支持 OMEMO 和 OpenPGP 兩種端到端加密方式，並且容許設定隱私相關的特性譬如已"
+"讀回條和正在輸入提示。"
 
 #: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
-msgstr ""
+msgstr "Dino 從伺服器取得訊息並與其他裝置同步。"
 
 #: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
-msgstr ""
+msgstr "含有對話的主視窗"
 
 #: main/data/add_conversation/conference_details_fragment.ui:19
 #: main/data/add_conversation/add_groupchat_dialog.ui:49
 #: main/data/add_conversation/add_contact_dialog.ui:49
 msgid "Account"
-msgstr ""
+msgstr "帳號"
 
 #: main/data/add_conversation/conference_details_fragment.ui:123
 #: main/data/add_conversation/add_groupchat_dialog.ui:120
 msgid "Nick"
-msgstr ""
+msgstr "暱稱"
 
 #: main/data/add_conversation/add_groupchat_dialog.ui:175
 #: main/data/add_conversation/add_contact_dialog.ui:102
 msgid "Alias"
-msgstr ""
+msgstr "別名"
 
 #: main/data/add_conversation/add_contact_dialog.ui:8
 msgid "Add Contact"
-msgstr ""
+msgstr "新增聯絡人"
 
 #: main/data/shortcuts.ui:12
 msgid "General"
@@ -756,32 +764,74 @@ msgstr "導航"
 
 #: main/data/shortcuts.ui:37
 msgid "Jump to next conversation"
-msgstr ""
+msgstr "跳到下一個對話"
 
 #: main/data/shortcuts.ui:44
 msgid "Jump to previous conversation"
-msgstr ""
+msgstr "跳到上一個對話"
 
 #: main/data/global_search.ui:37
 msgid "No active search"
-msgstr ""
+msgstr "目前没有搜尋"
 
 #: main/data/global_search.ui:52
 msgid "Type to start a search"
-msgstr ""
+msgstr "輸入關鍵字進行搜尋"
 
 #: main/data/global_search.ui:85
 msgid "No matching messages"
-msgstr ""
+msgstr "找不到符合條件的訊息"
 
 #: main/data/global_search.ui:100
 msgid "Check the spelling or try to remove filters"
-msgstr ""
+msgstr "檢查拼字或嘗試移除篩選器"
 
 #: main/data/unified_main_content.ui:48
 msgid "Click here to start a conversation or join a channel."
-msgstr ""
+msgstr "點擊此處開始對話或加入頻道。"
 
-#: main/data/unified_main_content.ui:147
+#: main/data/unified_main_content.ui:100
 msgid "You have no open chats"
-msgstr ""
+msgstr "您没有開啟的對話"
+
+#, c-format
+#~ msgid "%s, %s and %i others"
+#~ msgstr "%s、%s 和另外 %i 人"
+
+#, c-format
+#~ msgid "You can now start using %s"
+#~ msgstr "您現在可以開始使用 %s"
+
+#~ msgid "Open Registration"
+#~ msgstr "開啟網頁"
+
+#~ msgid "Save"
+#~ msgstr "儲存"
+
+#, c-format
+#~ msgid "%s, %s and %s"
+#~ msgstr "%s、%s 和 %s"
+
+#, c-format
+#~ msgid "%s and %s"
+#~ msgstr "%s 和 %s"
+
+#~ msgid "is typing…"
+#~ msgid_plural "are typing…"
+#~ msgstr[0] "正在輸入…"
+
+#~ msgid "has stopped typing"
+#~ msgstr "已經停止輸入"
+
+#, c-format
+#~ msgid "%i search results"
+#~ msgstr "%i 個搜尋結果"
+
+#~ msgid "Discover real JIDs"
+#~ msgstr "檢閱真正的 JID"
+
+#~ msgid "Who may discover real JIDs?"
+#~ msgstr "誰可以檢閱真正的 JID？"
+
+#~ msgid "Password required for room entry, if any"
+#~ msgstr "加入聊天室需要的密碼，可不填"
diff --git a/main/src/ui/conversation_content_view/chat_state_populator.vala b/main/src/ui/conversation_content_view/chat_state_populator.vala
index 545d2c6d..484ee0c4 100644
--- a/main/src/ui/conversation_content_view/chat_state_populator.vala
+++ b/main/src/ui/conversation_content_view/chat_state_populator.vala
@@ -107,13 +107,13 @@ private class MetaChatStateItem : Plugins.MetaConversationItem {
         }
         string new_text = "";
         if (jids.size > 3) {
-            new_text = _("%s, %s and %i others").printf(display_names[0], display_names[1], jids.size - 2);
+            new_text = _("%s, %s and %i others are typing").printf(display_names[0], display_names[1], jids.size - 2);
         } else if (jids.size == 3) {
             new_text = _("%s, %s and %s are typing…").printf(display_names[0], display_names[1], display_names[2]);
         } else if (jids.size == 2) {
             new_text =_("%s and %s are typing…").printf(display_names[0], display_names[1]);
         } else {
-            new_text = "%s is typing…".printf(display_names[0]);
+            new_text = _("%s is typing…").printf(display_names[0]);
         }
 
         label.label = new_text;