Update translations

36 files changed, 18269 insertions, 15896 deletions

diff --git a/main/po/LINGUAS b/main/po/LINGUAS
index 7468c547..741f3a5f 100644
--- a/main/po/LINGUAS
+++ b/main/po/LINGUAS
@@ -1,5 +1,6 @@
 ar
 ca
+cs
 de
 en
 eo
@@ -13,6 +14,7 @@ hu
 ie
 it
 ja
+ko
 lb
 lt
 nb
@@ -20,6 +22,7 @@ nl
 nl_BE
 oc
 pl
+pt
 pt_BR
 ro
 ru
diff --git a/main/po/ar.po b/main/po/ar.po
index ad4aceaf..b093607d 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-05-12 12:41+0000\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/translations/"
 "ar/>\n"
@@ -19,165 +19,99 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "مرحبا بكم على Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "إتّصل أو قم بإنشاء حساب للمواصلة."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "تهيئة الحساب"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "ليس هناك أية حسابات نشطة"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s و %s و %i آخرون يكتبون"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s و %s و %s يكتبون…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "تم إرسال الصورة"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s و %s يكتبان…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "تم إرسال الملف"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s يكتب حاليا…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "تم استلام الصورة"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "الرسالة طويلة جدًا"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "تم استلام الملف"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "تم تعديله"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "طلب اشتراك"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "قبول"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "غير مشفّرة"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "لا يمكن الإتصال بـ %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "تعذر إرسال الرسالة"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr "دعوة إلى %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr "دعاك %s إلى %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "أنا"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "البارحة"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
@@ -188,184 +122,76 @@ msgstr[3] "منذ %i د"
 msgstr[4] "منذ %i دقائق"
 msgstr[5] "منذ %i دقيقة"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "الآن"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr "تم إرسال الصورة"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "المالك"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr "تم إرسال الملف"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "المدير"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "تم استلام الصورة"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "عضو"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "تم استلام الملف"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "مستخدِم"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "طلب اشتراك"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "دعوة"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr "لا يمكن الإتصال بـ %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "دعوة إلى فريق محادثة"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr "دعوة إلى %s"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "الشروع في محادثة خاصة"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr "دعاك %s إلى %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "طرد"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "إزالة الحساب %s ؟"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "حذف"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "اختيار الصورة الرمزية"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr "اختيار"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "إلغاء"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "الصور"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "كافة الملفات"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "الإتصال جارٍ …"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "متصل"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "غير متصل"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "كلمة المرور خاطئة"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "شهادة TLS غير صالحة"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "خطأ"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "إضافة حساب"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "الإتصال بـ %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "يمكنك الآن استخدام حساب %s."
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "العنوان غير صالح"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "اسم المستخدم أو كلمة السر غير صحيحة"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "حدث خطأ ما"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "لا ردّ مِن طرف الخادم"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "قم بالتسجيل على %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "يتطلب الخادم التسجيل من خلال موقع ويب"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "افتح موقع الويب"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "إنشاء حساب"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "إطّلع على %s للمزيد من المعلومات حول التسجيل"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "أنا"
+msgid "%s from %s"
+msgstr "%s مِن %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -375,28 +201,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "البحث عن رسائل"
 
-#: main/src/ui/application.vala:200
-#: 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 "إنضمّ"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "الأعضاء"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s مِن %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "الشروع في محادثة"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "إضافة"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "إبدأ"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "الإلتحاق بقناة"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -406,23 +234,19 @@ msgstr "إضافة"
 msgid "Next"
 msgstr "التالي"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "الشروع في محادثة"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "إبدأ"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "في طريق الإلتحاق …"
@@ -455,46 +279,18 @@ msgstr "إختر إسما مستعارا آخر"
 msgid "Too many occupants in room"
 msgstr "غرفة المحادثة مكتضة"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "المالك"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "المدير"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "عضو"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "مستخدِم"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "دعوة"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "دعوة إلى فريق محادثة"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "الشروع في محادثة خاصة"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "طرد"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "العنوان غير صالح"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "إضافة"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -517,8 +313,63 @@ msgstr "في %s"
 msgid "With %s"
 msgstr "مع %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "الإعدادات المحلية"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "إرسال إشعارات عند الكتابة"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "إرسال إيصالات القراءة"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "الإشعارات"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "نشط"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "معطّل"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "فقط عندما يُشار إليّ"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "إفتراضي: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -529,6 +380,14 @@ msgstr "تفاصيل فريق المحادثة"
 msgid "Contact Details"
 msgstr "تفاصيل عن المُراسل"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "حظر"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "تم حظر الإتصال وتحديثات الحالة في كلا الإتجاهين"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "إسم غرفة المحادثة"
@@ -562,10 +421,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "من يمكنه رؤية JIDs الخاصة بالمشارِكين؟"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -601,163 +460,266 @@ msgstr "الحد الأقصى للسجِل المؤرَّخ الصادر عن ف
 msgid "Room Configuration"
 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 "الإعدادات"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "مرحبا بكم على Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "حظر"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "إتّصل أو قم بإنشاء حساب للمواصلة."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "تم حظر الإتصال وتحديثات الحالة في كلا الإتجاهين"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "تهيئة الحساب"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "ليس هناك أية حسابات نشطة"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "إدارة الحسابات"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "إزالة الحساب %s ؟"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "الإعدادات المحلية"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "حذف"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "إرسال إشعارات عند الكتابة"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "اختيار الصورة الرمزية"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "إرسال إيصالات القراءة"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "الصور"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "الإشعارات"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "كافة الملفات"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "نشط"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "الإتصال جارٍ …"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "معطّل"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "متصل"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "فقط عندما يُشار إليّ"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "غير متصل"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
-#, c-format
-msgid "Default: %s"
-msgstr "إفتراضي: %s"
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "كلمة المرور خاطئة"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "البحث عن رسائل"
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "شهادة TLS غير صالحة"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "الأعضاء"
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "خطأ"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "إضافة حساب"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "تحديث الرسالة"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "الإتصال بـ %s"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "الإشعار عند تلقي رسائل جديدة"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "يمكنك الآن استخدام حساب %s."
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "تحويل الوجوه المبتسمة إلى إيموجي"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "اسم المستخدم أو كلمة السر غير صحيحة"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "الحسابات"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "حدث خطأ ما"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "اللقب المحلي"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "لا ردّ مِن طرف الخادم"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "لم يتم إعداد أي حساب بعد"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "قم بالتسجيل على %s"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "إضافة حساب"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "يتطلب الخادم التسجيل من خلال موقع ويب"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "إنشاء حساب"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "افتح موقع الويب"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr "إنشاء حساب"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "لا يمكن إنشاء اتصال آمن"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "إطّلع على %s للمزيد من المعلومات حول التسجيل"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "اتصل"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "الرسالة طويلة جدًا"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "إختر خادمًا عموميًا"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "تم تعديله"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "أو قم بإدخال عنوان خادم"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s و %s و %i آخرون يكتبون"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "قم بتسجيل الدخول بدلاً من ذلك"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s و %s و %s يكتبون…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "إختيار سيرفر آخَر"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s و %s يكتبان…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "لقد أعددت كل شيء!"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s يكتب حاليا…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "أنهي"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "غير مشفّرة"
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "ختصارات لوحة المفاتيح"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "تعذر إرسال الرسالة"
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "عن Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "يريد هذا المراسل إضافتك إلى قائمة مراسليه"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "اليوم"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "تحديث الرسالة"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "اضغط هنا لبداية المحادثة أو للإنضمام إلى قناة."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 "الحساب"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "الإسم المستعار"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "اللقب"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "إضافة مُراسِل"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "الإشعار عند تلقي رسائل جديدة"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "تحويل الوجوه المبتسمة إلى إيموجي"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -787,25 +749,21 @@ msgid ""
 "devices."
 msgstr "يقوم Dino بجلب السِجلّ مِن السيرفر ثم يُزامِن الرسائل مع الأجهزة الأخرى."
 
-#: 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 "الحساب"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "لا يوجد بحث نشط"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "الإسم المستعار"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "أكتب للشروع في البحث"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "اللقب"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "لا توجد رسائل متطابقة"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "إضافة مُراسِل"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "تحقق مِن التدقيق الإملائي أو حاول إزالة فلاتر"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -831,29 +789,70 @@ msgstr "الإنتقال إلى المحادثة التالية"
 msgid "Jump to previous conversation"
 msgstr "الإنتقال إلى المحادثة السابقة"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "لا يوجد بحث نشط"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "الحسابات"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "أكتب للشروع في البحث"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "ختصارات لوحة المفاتيح"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "لا توجد رسائل متطابقة"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "عن Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "تحقق مِن التدقيق الإملائي أو حاول إزالة فلاتر"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "اللقب المحلي"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "اضغط هنا لبداية المحادثة أو للإنضمام إلى قناة."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "لم يتم إعداد أي حساب بعد"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "ليس لديك أية محادثة مفتوحة"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "إضافة حساب"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "إنشاء حساب"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "إنشاء حساب"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "لا يمكن إنشاء اتصال آمن"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "اتصل"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "إختر خادمًا عموميًا"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "أو قم بإدخال عنوان خادم"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "قم بتسجيل الدخول بدلاً من ذلك"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "إختيار سيرفر آخَر"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "لقد أعددت كل شيء!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "أنهي"
 
 #~ msgid "No active conversations"
 #~ msgstr "ليس هناك أية محادثات نشطة"
@@ -861,11 +860,9 @@ msgstr "ليس لديك أية محادثة مفتوحة"
 #~ msgid "Main window with conversations"
 #~ msgstr "النافذة الرئيسية بالمُحادثات"
 
-#, c-format
 #~ msgid "%s, %s and %i others"
 #~ msgstr "%s و %s و %i آخَرين"
 
-#, c-format
 #~ msgid "You can now start using %s"
 #~ msgstr "بإمكانك الآن الشروع في استخدام %s"
 
@@ -875,11 +872,9 @@ msgstr "ليس لديك أية محادثة مفتوحة"
 #~ msgid "Save"
 #~ msgstr "حفظ"
 
-#, c-format
 #~ msgid "%s, %s and %s"
 #~ msgstr "%s, %s و %s"
 
-#, c-format
 #~ msgid "%s and %s"
 #~ msgstr "%s و %s"
 
@@ -895,7 +890,6 @@ msgstr "ليس لديك أية محادثة مفتوحة"
 #~ msgid "has stopped typing"
 #~ msgstr "توقفَ عن الكتابة"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i نتيجة بحث"
 
diff --git a/main/po/ca.po b/main/po/ca.po
index 3aa3273d..4a65f3a6 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-05-27 21:08+0200\n"
 "Language-Team: Catalan; Valencian <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -15,176 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Us donem la benvinguda al Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Configureu un compte"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "No hi ha cap compte actiu"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gestiona els comptes"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s i %i altres estan escrivint…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s i %s estan escrivint…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s i %s estan escrivint…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s està escrivint…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "El missatge és massa llarg"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editat"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Accepta"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Sense xifrar"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "No s'ha pogut enviar el missatge"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H.%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l.%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H.%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H.%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l.%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H.%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l.%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Ara mateix"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -209,9 +39,21 @@ msgstr "Fitxer rebut"
 msgid "Subscription request"
 msgstr "Petició de subscripció"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Accepta"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Rebutja"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "No s'ha pogut connectar a %s"
@@ -235,129 +77,113 @@ msgstr "Sol·licitud de permís"
 msgid "%s requests the permission to write in %s"
 msgstr "%s demana el permís per a escriure a %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Voleu suprimir el compte %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Suprimeix"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Seleccioneu l'àvatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Selecciona"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Cancel·la"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Jo"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imatges"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Tots els fitxers"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ahir"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "S'està connectant…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H.%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Connectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l.%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Desconnectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fa %i minut"
+msgstr[1] "fa %i minuts"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Contrasenya incorrecta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Ara mateix"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "El certificat TLS és invàlid"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Propietari"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Error"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrador"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Afegeix un compte"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membre"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Entra a %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usuari"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Ara podeu emprar el compte %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Invita"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "L'adreça no és vàlida"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invita a la conferència"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Usuari o contrasenya incorrecta"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Inicia una convesa privada"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Ha fallat alguna cosa"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Expulsa"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "No s'ha rebut una resposta del servidor"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Autoritza el permís d'escriptura"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registre en %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revoca el permís d'escriptura"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Selecciona el fitxer"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Obre el lloc web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecciona"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registre"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Cancel·la"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Jo"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -367,28 +193,30 @@ msgstr "Aquesta conferència no us permet enviar missatges."
 msgid "Request permission"
 msgstr "Sol·licita el permís"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Cerca els missatges"
 
-#: main/src/ui/application.vala:200
-#: 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 "Uneix-te"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membres"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Inicia una conversa"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Afegeix"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Inicia"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Uneix-m'hi al canal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -398,23 +226,19 @@ msgstr "Afegeix"
 msgid "Next"
 msgstr "Següent"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Uneix-te"
+
 #: 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 "Enrere"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Inicia una conversa"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Inicia"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "S'està unint…"
@@ -447,46 +271,18 @@ msgstr "Seleccioneu un sobrenom diferent"
 msgid "Too many occupants in room"
 msgstr "Massa ocupants a la sala"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Propietari"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrador"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membre"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usuari"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Invita"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invita a la conferència"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Inicia una convesa privada"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Expulsa"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Autoritza el permís d'escriptura"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "L'adreça no és vàlida"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revoca el permís d'escriptura"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Afegeix"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -505,9 +301,64 @@ msgstr "En %s"
 msgid "With %s"
 msgstr "Amb %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Selecciona el fitxer"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Preferències"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Preferències locals"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Envia notificacions de tecleig"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Envia rebuts de lectura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Habilitat"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Inhabilitat"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Només quan rebeu una menció"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Per defecte: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Sol·licita"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permisos"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Sol·licita permís per a enviar missatges"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -517,6 +368,15 @@ msgstr "Detalls de la conferència"
 msgid "Contact Details"
 msgstr "Detalls del contacte"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloca"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"La comunicació i actualitzacions d'estat en ambdúes direccions estan blocades"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nom de la sala"
@@ -550,10 +410,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Qui té permís per a veure els JID dels membres?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -589,164 +449,266 @@ msgstr "Quantitat màxima de l'historial proporcionat per la sala"
 msgid "Room Configuration"
 msgstr "Configuració de la sala"
 
-#: 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 "Preferències"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Us donem la benvinguda al Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Bloca"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Entreu o creeu un compte per a començar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"La comunicació i actualitzacions d'estat en ambdúes direccions estan blocades"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configureu un compte"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Sol·licita"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "No hi ha cap compte actiu"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permisos"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gestiona els comptes"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Sol·licita permís per a enviar missatges"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Voleu suprimir el compte %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Preferències locals"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Suprimeix"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Envia notificacions de tecleig"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Seleccioneu l'àvatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Envia rebuts de lectura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imatges"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificacions"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Tots els fitxers"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Habilitat"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "S'està connectant…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Inhabilitat"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Connectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Només quan rebeu una menció"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconnectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Contrasenya incorrecta"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "El certificat TLS és invàlid"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Error"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Afegeix un compte"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Per defecte: %s"
+msgid "Sign in to %s"
+msgstr "Entra a %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Cerca els missatges"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Ara podeu emprar el compte %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membres"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Usuari o contrasenya incorrecta"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Envia un fitxer"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Ha fallat alguna cosa"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Actualitza el missatge"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "No s'ha rebut una resposta del servidor"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifica'm quan arriba un missatge nou"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registre en %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converteix «smileys» a emoji"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+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/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Comptes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Obre el lloc web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Àlias local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registre"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "No hi ha cap compte configurat"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Mireu %s per obtenir informació sobre com registrar-vos"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Afegeix un compte"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "El missatge és massa llarg"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Entra"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crea un compte"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s i %i altres estan escrivint…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "No s'ha pogut una connexió segura"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s i %s estan escrivint…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connecta"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s i %s estan escrivint…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Trieu un servidor públic"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s està escrivint…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "O especifiqueu l'adreça d'un servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Sense xifrar"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Entra"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "No s'ha pogut enviar el missatge"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Trieu un altre servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H.%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Tot llest!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Finalitza"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Dreceres de teclat"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Quant al Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Avui"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Envia un fitxer"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Actualitza el missatge"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "No teniu cap xat obert"
+
+#: 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 "Compte"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Sobrenom"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Àlias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Afegeix el contacte"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifica'm quan arriba un missatge nou"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converteix «smileys» a emoji"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -780,25 +742,21 @@ msgstr ""
 "Dino recupera l'historial del servidor i sincronitza els missatges amb "
 "altres dispositius."
 
-#: 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 "Compte"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "No hi ha cap cerca activa"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Sobrenom"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Teclegeu per a començar una cerca"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Àlias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "No hi ha missatges coincidents"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Afegeix el contacte"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Comproveu l'ortografia o proveu de suprimir filtres"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -824,29 +782,70 @@ msgstr "Salta a la conversa següent"
 msgid "Jump to previous conversation"
 msgstr "Salta a la conversa anterior"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "No hi ha cap cerca activa"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Comptes"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Teclegeu per a començar una cerca"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "No hi ha missatges coincidents"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Quant al Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Comproveu l'ortografia o proveu de suprimir filtres"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Àlias local"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "No hi ha cap compte configurat"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "No teniu cap xat obert"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Afegeix un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Entra"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crea un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "No s'ha pogut una connexió segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connecta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Trieu un servidor públic"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "O especifiqueu l'adreça d'un servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Entra"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Trieu un altre servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tot llest!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Finalitza"
 
 #~ msgid "No active conversations"
 #~ msgstr "Cap conversa activa"
@@ -854,11 +853,9 @@ msgstr "No teniu cap xat obert"
 #~ msgid "Main window with conversations"
 #~ msgstr "Finestra principal amb converses"
 
-#, 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"
 
@@ -868,11 +865,9 @@ msgstr "No teniu cap xat 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"
 
@@ -884,7 +879,6 @@ msgstr "No teniu cap xat obert"
 #~ msgid "has stopped typing"
 #~ msgstr "ha parat d'escriure"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i resultats de cerca"
 
diff --git a/main/po/cs.po b/main/po/cs.po
new file mode 100644
index 00000000..def32e85
--- /dev/null
+++ b/main/po/cs.po
@@ -0,0 +1,843 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-21 05:36+0000\n"
+"Language-Team: none\n"
+"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2.1-dev\n"
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr ""
+
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr ""
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr ""
+
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
+
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: 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:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Včera"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr ""
+
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr ""
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Zrušit"
+
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr ""
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
+msgstr ""
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+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
+#: main/data/manage_accounts/add_account_dialog.ui:410
+#: main/data/manage_accounts/add_account_dialog.ui:490
+msgid "Next"
+msgstr ""
+
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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 "Zpět"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Joining…"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:170
+msgid "Password required to enter room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:175
+msgid "Banned from joining or creating conference"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:177
+msgid "Room does not exist"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:179
+msgid "Not allowed to create room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:181
+msgid "Members-only room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:184
+msgid "Choose a different nick"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:186
+msgid "Too many occupants in room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr ""
+
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
+msgstr ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr ""
+
+#: main/src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr ""
+
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
+msgid "Contact Details"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:50
+msgid "Name of the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:53
+msgid "Description of the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
+msgid "Persistent"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:57
+msgid "The room will persist after the last occupant leaves"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
+msgid "Publicly searchable"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Occupants may change the subject"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Permission to view JIDs"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:70
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
+msgid "Password"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "A password to restrict access to the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Moderated"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Only occupants with voice may send messages"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
+msgid "Members only"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:79
+msgid "Only members may enter the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:82
+msgid "Message history"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:83
+msgid "Maximum amount of backlog issued by the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:89
+msgid "Room Configuration"
+msgstr ""
+
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Vítejte v Dino!"
+
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Chcete-li začít, přihlaste se nebo si vytvořte účet."
+
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Nastavit účet"
+
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Žádné aktivní účty"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Správa účtů"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+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:185
+msgid "edited"
+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/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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Dnes"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:8
+msgid "Modern XMPP Chat Client"
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:10
+msgid ""
+"Dino is a modern open-source chat client for the desktop. It focuses on "
+"providing a clean and reliable Jabber/XMPP experience while having your "
+"privacy in mind."
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:11
+msgid ""
+"It supports end-to-end encryption with OMEMO and OpenPGP and allows "
+"configuring privacy-related features such as read receipts and typing "
+"notifications."
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:12
+msgid ""
+"Dino fetches history from the server and synchronizes messages with other "
+"devices."
+msgstr ""
+
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr ""
+
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr ""
+
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr ""
+
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr ""
+
+#: main/data/file_send_overlay.ui:80
+msgid "Send"
+msgstr ""
+
+#: main/data/shortcuts.ui:12
+msgid "General"
+msgstr ""
+
+#: main/data/shortcuts.ui:32
+msgid "Conversation"
+msgstr ""
+
+#: main/data/shortcuts.ui:52
+msgid "Navigation"
+msgstr ""
+
+#: main/data/shortcuts.ui:57
+msgid "Jump to next conversation"
+msgstr ""
+
+#: main/data/shortcuts.ui:64
+msgid "Jump to previous conversation"
+msgstr ""
+
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr ""
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr ""
diff --git a/main/po/de.po b/main/po/de.po
index a549ac8e..5854eb5d 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-19 21:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-03 06:41+0000\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
 "de/>\n"
 "Language: de\n"
@@ -11,177 +11,7 @@ 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 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Willkommen bei Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Konto einrichten"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Keine Konten aktiv"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Konten verwalten"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s und %i andere tippen"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s und %s tippen…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s und %s tippen…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s tippt…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Nachricht zu lang"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "bearbeitet"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Annehmen"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Unverschlüsselt"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Nachricht kann nicht gesendet werden"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d. %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Gerade eben"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -207,9 +37,21 @@ msgstr "Datei empfangen"
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Annehmen"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Ablehnen"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Verbindung zu %s konnte nicht hergestellt werden"
@@ -233,129 +75,113 @@ msgstr "Berechtigungsanfrage"
 msgid "%s requests the permission to write in %s"
 msgstr "%s erbittet die Berechtigung zum Schreiben in %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Konto %s löschen?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Löschen"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Kontaktbild auswählen"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Auswählen"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Abbrechen"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ich"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Bilder"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d. %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Alle Dateien"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Gestern"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Verbinden…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Verbunden"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Nicht verbunden"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "vor %i min"
+msgstr[1] "vor %i min"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Passwort falsch"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Gerade eben"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Ungültiges TLS-Zertifikat"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eigentümer"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Fehler"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Konto hinzufügen"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Mitglied"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Bei %s einloggen"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Gast"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Du kannst das Konto %s jetzt benutzen."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Einladen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Ungültige Adresse"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Zur Konferenz einladen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Benutzername oder Passwort falsch"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Private Unterhaltung beginnen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Etwas ist schief gelaufen"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Hinauswerfen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Keine Antwort vom Server"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Schreibberechtigung erteilen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Konto auf %s erstellen"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Schreibberechtigung entziehen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Der Server erfordert die Registrierung durch eine Webseite"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Datei auswählen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Webseite öffnen"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Auswählen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrieren"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Abbrechen"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ich"
+msgid "%s from %s"
+msgstr "%s aus %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -365,28 +191,30 @@ msgstr "Diese Konferenz erlaubt es dir nicht, Nachrichten zu senden."
 msgid "Request permission"
 msgstr "Berechtigung anfordern"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Nachrichten suchen"
 
-#: main/src/ui/application.vala:200
-#: 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 "Beitreten"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Mitglieder"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s aus %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Unterhaltung starten"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Hinzufügen"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Starten"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanal beitreten"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -396,23 +224,19 @@ msgstr "Hinzufügen"
 msgid "Next"
 msgstr "Weiter"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Beitreten"
+
 #: 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 "Zurück"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Unterhaltung starten"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Starten"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Beitreten…"
@@ -445,46 +269,18 @@ msgstr "Wähle einen anderen Spitznamen"
 msgid "Too many occupants in room"
 msgstr "Zu viele Nutzer im Raum"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eigentümer"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Admin"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Mitglied"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Gast"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Einladen"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Zur Konferenz einladen"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Private Unterhaltung beginnen"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Hinauswerfen"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Schreibberechtigung erteilen"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Ungültige Adresse"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Schreibberechtigung entziehen"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Hinzufügen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -503,9 +299,64 @@ msgstr "In %s"
 msgid "With %s"
 msgstr "Mit %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Datei auswählen"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale Einstellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Tippbenachrichtigungen senden"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Lesebestätigungen senden"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "An"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Aus"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Nur bei Erwähnung"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Standard: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Anfragen"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Berechtigung zum Senden von Nachrichten anfordern"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -515,6 +366,15 @@ msgstr "Konferenzdetails"
 msgid "Contact Details"
 msgstr "Kontaktdetails"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blockieren"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"Kommunikation und Statusaktualisierungen sind in beide Richtungen blockiert"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Name des Raums"
@@ -549,10 +409,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Wer darf die JIDs von Nutzern sehen?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Passwort"
 
@@ -588,164 +448,267 @@ msgstr "Anzahl der für diesen Raum gespeicherten Nachrichten"
 msgid "Room Configuration"
 msgstr "Raum Konfiguration"
 
-#: 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 "Einstellungen"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Willkommen bei Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blockieren"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Melde dich an oder erstelle ein Konto, um loszulegen."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"Kommunikation und Statusaktualisierungen sind in beide Richtungen blockiert"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Konto einrichten"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Anfragen"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Keine Konten aktiv"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Berechtigungen"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Konten verwalten"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Berechtigung zum Senden von Nachrichten anfordern"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Konto %s löschen?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokale Einstellungen"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Löschen"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Tippbenachrichtigungen senden"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Kontaktbild auswählen"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Lesebestätigungen senden"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Bilder"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Alle Dateien"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "An"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Verbinden…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Aus"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Verbunden"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Nur bei Erwähnung"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Nicht verbunden"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Passwort falsch"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Ungültiges TLS-Zertifikat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Fehler"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Konto hinzufügen"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Standard: %s"
+msgid "Sign in to %s"
+msgstr "Bei %s einloggen"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Nachrichten suchen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Du kannst das Konto %s jetzt benutzen."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Mitglieder"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Benutzername oder Passwort falsch"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Datei senden"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Etwas ist schief gelaufen"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Nachricht aktualisieren"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Keine Antwort vom Server"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Konto auf %s erstellen"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileys zu Emojis umwandeln"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Der Server erfordert die Registrierung durch eine Webseite"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Konten"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Webseite öffnen"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokaler Alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registrieren"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Keine Konten konfiguriert"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Eventuell sind auf %s Informationen zur Registrierung zu finden"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Konto hinzufügen"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Nachricht zu lang"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Einloggen"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "bearbeitet"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Konto erstellen"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s und %i andere tippen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Es konnte keine sichere Verbindung hergestellt werden"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s und %s tippen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Verbinden"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s und %s tippen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Wähle einen öffentlichen Server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s tippt…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Oder gib eine Serveradresse an"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Unverschlüsselt"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Stattdessen einloggen"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Nachricht kann nicht gesendet werden"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Anderen Server wählen"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Fertig!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Fertig"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Tastenkombinationen"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Info zu Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Heute"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Datei senden"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Nachricht aktualisieren"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Du hast keine offenen Chats"
+
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Anzeigename"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Kontakt hinzufügen"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileys zu Emojis umwandeln"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -779,25 +742,21 @@ msgstr ""
 "Dino ruft Gesprächsverläufe vom Server ab und synchronisiert Nachrichten mit "
 "anderen Geräten."
 
-#: 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Keine Suche gestartet"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Anzeigename"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Tippe um eine Suche zu beginnen"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Keine Nachrichten gefunden"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Kontakt hinzufügen"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Überprüfe die Schreibweise oder entferne Filter"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -809,7 +768,7 @@ msgstr "Allgemein"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Unterhaltung"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -823,30 +782,70 @@ msgstr "Zur nächsten Konversation springen"
 msgid "Jump to previous conversation"
 msgstr "Zur letzten Konversation springen"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Keine Suche gestartet"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Konten"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Tippe um eine Suche zu beginnen"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Tastenkombinationen"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Keine Nachrichten gefunden"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Info zu Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Überprüfe die Schreibweise oder entferne Filter"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokaler Alias"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Keine Konten konfiguriert"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Du hast keine offenen Chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Konto hinzufügen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Einloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Konto erstellen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Es konnte keine sichere Verbindung hergestellt werden"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Verbinden"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Wähle einen öffentlichen Server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Oder gib eine Serveradresse an"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Stattdessen einloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Anderen Server wählen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Fertig!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Fertig"
 
 #~ msgid "No active conversations"
 #~ msgstr "Keine Unterhaltung aktiv"
@@ -854,11 +853,9 @@ msgstr "Du hast keine offenen Chats"
 #~ msgid "Main window with conversations"
 #~ msgstr "Hauptfenster mit Konversationen"
 
-#, 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"
 
@@ -868,11 +865,9 @@ msgstr "Du hast keine offenen Chats"
 #~ 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"
 
@@ -884,7 +879,6 @@ msgstr "Du hast keine offenen Chats"
 #~ msgid "has stopped typing"
 #~ msgstr "hat aufgehört zu tippen"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i Suchergebnisse"
 
diff --git a/main/po/dino.pot b/main/po/dino.pot
index 752a1c0f..82248453 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+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,348 +18,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, 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…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
+msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr ""
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
 msgstr ""
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
 msgstr ""
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
 msgstr ""
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
 msgstr ""
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
 msgstr ""
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
 msgstr ""
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 ""
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
+msgid "%s from %s"
 msgstr ""
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
@@ -370,27 +196,29 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
-msgid "Join Channel"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
@@ -401,23 +229,19 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr ""
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr ""
@@ -450,66 +274,93 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
 msgstr ""
 
-#: main/src/ui/global_search.vala:140
-#, c-format
-msgid "%i search result"
-msgid_plural "%i search results"
-msgstr[0] ""
-msgstr[1] ""
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
 
-#: main/src/ui/global_search.vala:167
-#, c-format
-msgid "In %s"
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/global_search.vala:167
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
 #, c-format
-msgid "With %s"
+msgid "Default: %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr ""
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr ""
@@ -553,10 +412,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr ""
 
@@ -592,162 +451,265 @@ msgstr ""
 msgid "Room Configuration"
 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"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
+msgid "Sign in to %s"
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
 msgstr ""
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+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/date_separator_populator.vala:83
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
@@ -774,24 +736,20 @@ msgid ""
 "devices."
 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"
+#: main/data/global_search.ui:37
+msgid "No active search"
 msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
 msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
 msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -818,26 +776,67 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
diff --git a/main/po/en.po b/main/po/en.po
index 63bbb9a2..ff6ae899 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,354 +2,180 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+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:198
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, 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…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
+msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr ""
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
 msgstr ""
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
 msgstr ""
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
 msgstr ""
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
 msgstr ""
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
 msgstr ""
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
 msgstr ""
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 ""
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
+msgid "%s from %s"
 msgstr ""
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
@@ -360,27 +186,29 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
-msgid "Join Channel"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
@@ -391,23 +219,19 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr ""
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr ""
@@ -440,66 +264,93 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
 msgstr ""
 
-#: main/src/ui/global_search.vala:140
-#, c-format
-msgid "%i search result"
-msgid_plural "%i search results"
-msgstr[0] ""
-msgstr[1] ""
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
 
-#: main/src/ui/global_search.vala:167
-#, c-format
-msgid "In %s"
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/global_search.vala:167
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
 #, c-format
-msgid "With %s"
+msgid "Default: %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -510,6 +361,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr ""
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr ""
@@ -543,10 +402,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr ""
 
@@ -582,162 +441,265 @@ msgstr ""
 msgid "Room Configuration"
 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"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
+msgid "Sign in to %s"
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
 msgstr ""
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+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/date_separator_populator.vala:83
+msgid "Today"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
@@ -764,24 +726,20 @@ msgid ""
 "devices."
 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"
+#: main/data/global_search.ui:37
+msgid "No active search"
 msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
 msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
 msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -808,26 +766,67 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index f4463148..0542e939 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-02-01 15:50+0000\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
 "translations/eo/>\n"
@@ -18,176 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Bonvenon al Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Ensalutu aŭ kreu konton por komenci."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Agordi konton"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Neniuj aktivaj kontoj"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Administri kontojn"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, 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:158
-msgid "Message too long"
-msgstr "Mesaĝo tro longa"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr ""
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Akcepti"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Neĉifrita"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr ""
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d-a %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Ĵus"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -212,9 +42,21 @@ msgstr "Dosieron ricevis"
 msgid "Subscription request"
 msgstr "Abona peto"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Akcepti"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Rifuzi"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Ne povus konekti al %s"
@@ -238,129 +80,113 @@ msgstr ""
 msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Ĉu forigi konton %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Forigi"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Elekti profilbildon"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Elekti"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Mi"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Nuligi"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Bildoj"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Hieraŭ"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Ĉiuj dosieroj"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Konektado…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Konektita"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Antaŭ %i minuto"
+msgstr[1] "Antaŭ %i minutoj"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Malkonektita"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Ĵus"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Malĝusta pasvorto"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Posedanto"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Nevalida TLSa atesto"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administranto"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Eraro"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Aldoni Konton"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Uzanto"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Signo en al %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Inviti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Nevalida adreso"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Malĝusta uzantnomo aŭ pasvorto"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Io misis"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Komenci privatan interparolon"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Nenia respondo de servilo"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registriĝi sur %s"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registriĝi"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Elekti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "Rigardi %s por informo pri kiel registriĝi"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Nuligi"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Mi"
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr "%s el %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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 "Aliĝi"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s el %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Komenci Konversacion"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Aldoni"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Komenci"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Aliĝi al babilejo"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Aldoni"
 msgid "Next"
 msgstr "Sekva"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Aliĝi"
+
 #: 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 "Retre"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Komenci Konversacion"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Komenci"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr ""
@@ -450,46 +274,18 @@ msgstr "Elektu malsaman kromnomon"
 msgid "Too many occupants in room"
 msgstr "Tro da okupantoj en babilejo"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Posedanto"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administranto"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membro"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Uzanto"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Inviti"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr ""
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Komenci privatan interparolon"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr ""
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Nevalida adreso"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Aldoni"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,8 +304,63 @@ msgstr ""
 msgid "With %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Agordoj"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokaj Agordoj"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Sciigi pri tajpado"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Sciigoj"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Ek"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "For"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Nur menciite"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr "Kontaktaj Detaloj"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nomo de la ĉambro"
@@ -553,10 +412,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -592,164 +451,267 @@ msgstr "Maksimuma nombro da historiaj mesaĝoj donotaj de la ĉambro"
 msgid "Room Configuration"
 msgstr "Ĉambraj Agordoj"
 
-#: 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 "Agordoj"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Bonvenon al Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr ""
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Ensalutu aŭ kreu konton por komenci."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Agordi konton"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Neniuj aktivaj kontoj"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Administri kontojn"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Ĉu forigi konton %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokaj Agordoj"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Forigi"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Sciigi pri tajpado"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Elekti profilbildon"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Bildoj"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Sciigoj"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Ĉiuj dosieroj"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Ek"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Konektado…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "For"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Konektita"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Nur menciite"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Malkonektita"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
-#, c-format
-msgid "Default: %s"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Malĝusta pasvorto"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Nevalida TLSa atesto"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Eraro"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Aldoni Konton"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Signo en al %s"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Sciigi pri envenaj mesaĝoj"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Malĝusta uzantnomo aŭ pasvorto"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Grafikigi tekstajn mienetojn"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Io misis"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Kontoj"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Nenia respondo de servilo"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Loka kaŝnomo"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registriĝi sur %s"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Aldoni konton"
-
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registriĝi"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Rigardi %s por informo pri kiel registriĝi"
+
+#: 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:185
+msgid "edited"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: 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/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d-a %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Kaŝnomo"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Kaŝnomo"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
 msgstr ""
 
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Sciigi pri envenaj mesaĝoj"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Grafikigi tekstajn mienetojn"
+
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr ""
@@ -774,24 +736,20 @@ msgid ""
 "devices."
 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Kaŝnomo"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Kaŝnomo"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -818,38 +776,77 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Kontoj"
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Loka kaŝnomo"
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Aldoni konton"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
 
 #~ msgid "No active conversations"
 #~ msgstr "Neniu aktiva interparolo"
 
-#, 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"
 
@@ -859,11 +856,9 @@ msgstr ""
 #~ 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"
 
diff --git a/main/po/es.po b/main/po/es.po
index e76b0c50..5f83bd87 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-25 16:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-24 13:53+0000\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
 "translations/es/>\n"
 "Language: es\n"
@@ -16,177 +16,7 @@ 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 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "¡Bienvenido a Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Configurar cuenta"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "No hay cuentas activas"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gestionar cuentas"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s y otros %i están escribiendo"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s y %s están escribiendo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s y %s están escribiendo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s está escribiendo…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mensaje demasiado largo"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editado"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Aceptar"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Sin cifrar"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "No se pudo enviar el mensaje"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Ahora"
+"X-Generator: Weblate 4.2.1-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -212,9 +42,21 @@ msgstr "Archivo recibido"
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Aceptar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Denegar"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "No se pudo conectar a %s"
@@ -238,129 +80,113 @@ msgstr "Solicitud de permiso"
 msgid "%s requests the permission to write in %s"
 msgstr "%s solicita permiso para escribir en %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "¿Eliminar cuenta %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Eliminar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Seleccionar imagen de perfil"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Seleccionar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Cancelar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Yo"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imágenes"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Todos los archivos"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ayer"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Conectando…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Conectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Desconectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "hace %i min"
+msgstr[1] "hace %i mins"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Ahora"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificado TLS inválido"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Propietario"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Error"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrador"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Añadir Cuenta"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Miembro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Iniciar sesión con %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usuario"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Ya puedes usar tu cuenta %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Invitar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Dirección inválida"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invitar a Conversación en grupo"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Usuario o contraseña incorrecta"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Iniciar conversación privada"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Algo salió mal"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Expulsar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "No hay respuesta del servidor"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Conceder permiso para escribir"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registrarte en %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revocar permiso para escribir"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Seleccionar archivo"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Abrir sitio web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seleccionar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registro"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Cancelar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Yo"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr "Esta conversación no permite que escribas mensajes."
 msgid "Request permission"
 msgstr "Solicitar permiso"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Buscar mensajes"
 
-#: main/src/ui/application.vala:200
-#: 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 "Unirse"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Miembros"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Iniciar Conversación"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Añadir"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Iniciar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Unirse a canal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Añadir"
 msgid "Next"
 msgstr "Siguiente"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Unirse"
+
 #: 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 "Volver"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar Conversación"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Iniciar"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Uniéndose…"
@@ -451,46 +275,18 @@ msgstr "Elige un alias diferente"
 msgid "Too many occupants in room"
 msgstr "La conversación tiene demasiados ocupantes"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Propietario"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrador"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Miembro"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usuario"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Invitar"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invitar a Conversación en grupo"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Iniciar conversación privada"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Expulsar"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Conceder permiso para escribir"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Dirección inválida"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revocar permiso para escribir"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Añadir"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -509,9 +305,64 @@ msgstr "En %s"
 msgid "With %s"
 msgstr "Con %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Seleccionar archivo"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Ajustes"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Ajustes locales"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar notificaciones cuando escribes"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Enviar confirmaciones de lectura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Sí"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "No"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Solo cuando te mencionan en la conversación"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Por defecto: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Solicitar"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permisos"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Solicitar permiso para enviar mensajes"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -521,6 +372,14 @@ msgstr "Detalles de la Conversación"
 msgid "Contact Details"
 msgstr "Detalles del contacto"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquear"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Las comunicaciones y las actualizaciones de presencia serán bloqueadas"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nombre de la conversación en grupo"
@@ -554,10 +413,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "¿Quién puede ver los JID's de los ocupantes?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Contraseña"
 
@@ -593,163 +452,268 @@ msgstr "Número máximo de mensajes que se almacenan en servidor"
 msgid "Room Configuration"
 msgstr "Configuración de la conversación en grupo"
 
-#: 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 "Ajustes"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "¡Bienvenido a Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Bloquear"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Inicia sesión o crea una nueva cuenta para empezar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Las comunicaciones y las actualizaciones de presencia serán bloqueadas"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurar cuenta"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Solicitar"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "No hay cuentas activas"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permisos"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gestionar cuentas"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Solicitar permiso para enviar mensajes"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "¿Eliminar cuenta %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Ajustes locales"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Eliminar"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Enviar notificaciones cuando escribes"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Seleccionar imagen de perfil"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Enviar confirmaciones de lectura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imágenes"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificaciones"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Todos los archivos"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Sí"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conectando…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "No"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Solo cuando te mencionan en la conversación"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificado TLS inválido"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Error"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Añadir Cuenta"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Por defecto: %s"
+msgid "Sign in to %s"
+msgstr "Iniciar sesión con %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Buscar mensajes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Ya puedes usar tu cuenta %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Miembros"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Usuario o contraseña incorrecta"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Envía un archivo"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Algo ha ido mal"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Modificar mensaje"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "No hay respuesta del servidor"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notificar cuando llega un nuevo mensaje"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registrarte en %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertir smileys en emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "El servidor requiere registro a través de un sitio web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Cuentas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Abrir sitio web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alias local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registro"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "No hay cuentas activas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Mira %s para mas información sobre el registro"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Añadir una cuenta"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensaje demasiado largo"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Iniciar Sesión"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editado"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crear cuenta"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s y otros %i están escribiendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "No se pudo establecer una conexión segura"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s y %s están escribiendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Conectar"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s y %s están escribiendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Escoger un servidor publico"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s está escribiendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "O especifica la dirección del servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Sin cifrar"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Volver a Iniciar sesión"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "No se pudo enviar el mensaje"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Escoge otro servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "¡Todo preparado!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Terminar"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Atajos de teclado"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Sobre Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoy"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Envía un archivo"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Modificar mensaje"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+"Pulsa aquí para empezar una nueva conversación o unirse a una conversación "
+"en grupo."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+msgstr "No tienes conversaciones abiertas"
+
+#: 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 "Cuenta"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Añadir contacto"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar cuando llega un nuevo mensaje"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertir smileys en emojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -783,25 +747,21 @@ msgstr ""
 "Dino recupera los mensajes desde el servidor y sincroniza los mensajes con "
 "otros dispositivos."
 
-#: 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 "Cuenta"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Búsqueda no activa"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Alias"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Escribe para empezar una búsqueda"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Sin mensajes que coincidan"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Añadir contacto"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Verifique la ortografía o intente eliminar los filtros"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -813,7 +773,7 @@ msgstr "General"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Conversación"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -827,31 +787,70 @@ msgstr "Saltar a siguiente conversación"
 msgid "Jump to previous conversation"
 msgstr "Saltar a conversación previa"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Búsqueda no activa"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Escribe para empezar una búsqueda"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Sin mensajes que coincidan"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Sobre Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Verifique la ortografía o intente eliminar los filtros"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alias local"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr ""
-"Pulsa aquí para empezar una nueva conversación o unirse a una conversación "
-"en grupo."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "No hay cuentas activas"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "No tienes conversaciones abiertas"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Añadir una cuenta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Iniciar Sesión"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crear cuenta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "No se pudo establecer una conexión segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Conectar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Escoger un servidor publico"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "O especifica la dirección del servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Volver a Iniciar sesión"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Escoge otro servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "¡Todo preparado!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Terminar"
 
 #~ msgid "No active conversations"
 #~ msgstr "No hay conversaciones activa"
@@ -859,11 +858,9 @@ msgstr "No tienes conversaciones abiertas"
 #~ msgid "Main window with conversations"
 #~ msgstr "Ventana principal con conversaciones"
 
-#, 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"
 
@@ -873,11 +870,9 @@ msgstr "No tienes conversaciones abiertas"
 #~ 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"
 
@@ -889,7 +884,6 @@ msgstr "No tienes conversaciones abiertas"
 #~ msgid "has stopped typing"
 #~ msgstr "ha dejado de escribir"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i resultados de la búsqueda"
 
diff --git a/main/po/eu.po b/main/po/eu.po
index 210b4b08..8d49aa44 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-05-11 10:41+0000\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
 "eu/>\n"
@@ -18,349 +18,175 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Ongi etorri Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Saioa hasi edo kontu bat sortu hasteko."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Kontu bat ezarri"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Ez dago kontu aktiborik"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Kontuak kudeatu"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s eta beste %i idatzen ari dira"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s eta %s idazten ari dira…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "Irudia bidali da"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s eta %s idazten ari dira…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "Fitxategia bidali da"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s idazten ari da…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Irudia jaso da"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mezu luzeegia"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Fitxategia jaso da"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editatuta"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Harpidetzaren eskaera"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Onartu"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Enkriptatu gabe"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "Ezin izan da %s(e)ra konektatu"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Ezin da mezua bidali"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr "%s(e)ra gonbidapena"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr "%s(e)k %s(e)ra gonbidatu zaitu"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ni"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Atzo"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "Orain"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr "Irudia bidali da"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Jabea"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr "Fitxategia bidali da"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administratzailea"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "Irudia jaso da"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Kidea"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "Fitxategia jaso da"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Erabiltzailea"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "Harpidetzaren eskaera"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Gonbidatu"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr "Ezin izan da %s(e)ra konektatu"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Konferentziara gonbidatu"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr "%s(e)ra gonbidapena"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Solasaldi pribatua hasi"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr "%s(e)k %s(e)ra gonbidatu zaitu"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kanporatu"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "%s kontua kendu?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Kendu"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Irudia hautatu"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr "Hautatu"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "Utzi"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Irudiak"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Fitxategi guztiak"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Konektatzen…"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Konektatuta"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Ez konektatuta"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Pasahitz okerra"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "TLS ziurtagiri ez balidouna"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Akatsa"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Kontua gehitu"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Hasi saioa %s(e)n"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Orain %s kontua erabili dezakezu."
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Helbide ez balioduna"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Erabiltzaile izen edo pasahitz okerra"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Zerbait oker joan da"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Erantzunik ez zerbitzaritik"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Izena eman hemen: %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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 website"
-msgstr "Webgunea ireki"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Izena eman"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ni"
+msgid "%s from %s"
+msgstr "%s hemendik: %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Mezuak bilatu"
 
-#: main/src/ui/application.vala:200
-#: 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 "Batu"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Kideak"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s hemendik: %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Elkarrizketa hasi"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Gehitu"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Hasi"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanalera gehitu"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Gehitu"
 msgid "Next"
 msgstr "Hurrengoa"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Batu"
+
 #: 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 "Atzera"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Elkarrizketa hasi"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Hasi"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Batzen…"
@@ -450,46 +274,18 @@ msgstr "Ezizen ezberdin bat hautatu"
 msgid "Too many occupants in room"
 msgstr "Gelak kide gehiegi ditu"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Jabea"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administratzailea"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Kidea"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Erabiltzailea"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Gonbidatu"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Konferentziara gonbidatu"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Solasaldi pribatua hasi"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kanporatu"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Helbide ez balioduna"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Gehitu"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,8 +304,63 @@ msgstr "hemen %s"
 msgid "With %s"
 msgstr "%s(r)ekin"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Bertako ezarpenak"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Idazte jakinarazpenak bidali"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Bidali irakurtze baieztapena"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Jakinarazpenak"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Piztuta"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Itzalita"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Soilik aipatua izaterakoan"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Lehenetsia: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,15 @@ msgstr "Konferentziaren xehetasunak"
 msgid "Contact Details"
 msgstr "Kontaktuaren xehetasunak"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokeatu"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"Komunikazioa eta egoeraren eguneraketak edozein norabideetan blokeatuta daude"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Gelaren izena"
@@ -553,10 +413,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Nor dago baimenduta parte-hartzaileen JIDak ikusteko?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -592,164 +452,266 @@ msgstr "Gelak itzuliko dituen gehienezko historiako mezuak"
 msgid "Room Configuration"
 msgstr "Gelaren konfigurazioa"
 
-#: 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 "Ezarpenak"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Ongi etorri Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blokeatu"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Saioa hasi edo kontu bat sortu hasteko."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"Komunikazioa eta egoeraren eguneraketak edozein norabideetan blokeatuta daude"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Kontu bat ezarri"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Ez dago kontu aktiborik"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Kontuak kudeatu"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "%s kontua kendu?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Bertako ezarpenak"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Kendu"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Idazte jakinarazpenak bidali"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Irudia hautatu"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Bidali irakurtze baieztapena"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Irudiak"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Jakinarazpenak"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Fitxategi guztiak"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Piztuta"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Konektatzen…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Itzalita"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Konektatuta"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Soilik aipatua izaterakoan"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Ez konektatuta"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Pasahitz okerra"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "TLS ziurtagiri ez balidouna"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Akatsa"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Kontua gehitu"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Lehenetsia: %s"
+msgid "Sign in to %s"
+msgstr "Hasi saioa %s(e)n"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Mezuak bilatu"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Orain %s kontua erabili dezakezu."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Kideak"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Erabiltzaile izen edo pasahitz okerra"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Zerbait oker joan da"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Mezua eguneratu"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Erantzunik ez zerbitzaritik"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Mezu berri bat heltzerakoan jakinarazi"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Izena eman hemen: %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Irrifartxoak emotikono bihurtu"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Zerbitzariak webgune baten bidez izena ematea eskatzen du"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Kontuak"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Webgunea ireki"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Bertako ezizena"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Izena eman"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Ez dago konfiguratutako konturik"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Ikusi %s izena ematearen inguruko informazioa lortzeko"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Kontu bat gehitu"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mezu luzeegia"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Saioa hasi"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editatuta"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Kontua sortu"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s eta beste %i idatzen ari dira"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Ezin izan da konexio seguru bat ezarri"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s eta %s idazten ari dira…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Konektatu"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s eta %s idazten ari dira…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Zerbitzari publiko bat hautatu"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s idazten ari da…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Edo zerbitzari baten helbidea zehaztu"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Enkriptatu gabe"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Saioa hasi"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Ezin da mezua bidali"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Beste zerbitzari bat hartu"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Guztia ezarri da!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Amaitu"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Laster-teklak"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Dinori buruz"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Gaur"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Mezua eguneratu"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "Klikatu hemen elkarrizketa berri bat hasi edo kanal batean sartzeko."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+msgstr "Ez duzu irekitako txatik"
+
+#: 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 "Kontuak"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Ezizena"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Ezizena"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Kontaktua gehitu"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Mezu berri bat heltzerakoan jakinarazi"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Irrifartxoak emotikono bihurtu"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -783,25 +745,21 @@ msgstr ""
 "Dinok zerbitzaritik hartzen du historia eta beste gailuekin mezuak "
 "sinkronizatzen ditu."
 
-#: 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 "Kontuak"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Ez dago bilaketa aktiborik"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Ezizena"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Idatzi bilatzen hasteko"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Ezizena"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Ez dago bat egiten duen mezurik"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Kontaktua gehitu"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Ortografia egiaztatu edo saiatu iragazkiak kentzen"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -827,29 +785,70 @@ msgstr "Jauzi hurrengo elkarrizketara"
 msgid "Jump to previous conversation"
 msgstr "Jauzi aurreko elkarrizketara"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Ez dago bilaketa aktiborik"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Kontuak"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Idatzi bilatzen hasteko"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Laster-teklak"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Ez dago bat egiten duen mezurik"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Dinori buruz"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Ortografia egiaztatu edo saiatu iragazkiak kentzen"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Bertako ezizena"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "Klikatu hemen elkarrizketa berri bat hasi edo kanal batean sartzeko."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Ez dago konfiguratutako konturik"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Ez duzu irekitako txatik"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Kontu bat gehitu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Saioa hasi"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Kontua sortu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Ezin izan da konexio seguru bat ezarri"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Konektatu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Zerbitzari publiko bat hautatu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Edo zerbitzari baten helbidea zehaztu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Saioa hasi"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Beste zerbitzari bat hartu"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Guztia ezarri da!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Amaitu"
 
 #~ msgid "No active conversations"
 #~ msgstr "Ez dago solasaldi aktiborik"
@@ -857,11 +856,9 @@ msgstr "Ez duzu irekitako txatik"
 #~ msgid "Main window with conversations"
 #~ msgstr "Leiho nagusia elkarrizketekin"
 
-#, 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"
 
@@ -871,11 +868,9 @@ msgstr "Ez duzu irekitako txatik"
 #~ 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"
 
@@ -887,7 +882,6 @@ msgstr "Ez duzu irekitako txatik"
 #~ msgid "has stopped typing"
 #~ msgstr "idazteari utzi dio"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "Bilaketaren emaitzak: %i"
 
diff --git a/main/po/fa.po b/main/po/fa.po
index a0854806..e822ad76 100644
--- a/main/po/fa.po
+++ b/main/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-05-07 14:13+0000\n"
 "Language-Team: none\n"
 "Language: fa\n"
@@ -17,381 +17,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "به Dino خوش آمدید!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "برای شروع یک اکانت بسازید یا وارد شوید."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "اکانت تنظیم کنید"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "هیچ حسابی فعال نیست"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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 ""
-
-#: 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
-#, fuzzy, 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…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr ""
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "دیروز"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr ""
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
 msgstr ""
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
 msgstr ""
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
 msgstr ""
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
 msgstr ""
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
 msgstr ""
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
 msgstr ""
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 ""
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Register on %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
+msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-msgid "Check %s for information on how to sign up"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "This conference does not allow you to send messages."
-msgstr ""
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "شروع گفتگو"
 
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "Request permission"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
 msgstr ""
 
-#: main/src/ui/application.vala:200
 #: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
 msgid "Join Channel"
 msgstr "وارد کانال شو"
 
-#: main/src/ui/application.vala:200
-#: 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 ""
-
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr ""
-
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-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
@@ -400,23 +228,19 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "شروع گفتگو"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr ""
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr ""
@@ -449,66 +273,93 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
 msgstr ""
 
-#: main/src/ui/global_search.vala:140
-#, c-format
-msgid "%i search result"
-msgid_plural "%i search results"
-msgstr[0] ""
-msgstr[1] ""
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
 
-#: main/src/ui/global_search.vala:167
-#, c-format
-msgid "In %s"
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/global_search.vala:167
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
 #, c-format
-msgid "With %s"
+msgid "Default: %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -519,6 +370,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr ""
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr ""
@@ -552,10 +411,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr ""
 
@@ -591,162 +450,265 @@ msgstr ""
 msgid "Room Configuration"
 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"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "به Dino خوش آمدید!"
+
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "برای شروع یک اکانت بسازید یا وارد شوید."
+
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "اکانت تنظیم کنید"
+
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "هیچ حسابی فعال نیست"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "مدیریت اکانت ها"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
 #, c-format
-msgid "Default: %s"
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
 msgstr ""
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr ""
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "امروز"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a , %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
@@ -773,24 +735,20 @@ msgid ""
 "devices."
 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"
+#: main/data/global_search.ui:37
+msgid "No active search"
 msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
 msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
 msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -817,28 +775,69 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
 
 #~ msgid "No active conversations"
diff --git a/main/po/fi.po b/main/po/fi.po
index 919a31eb..828574aa 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-04-12 20:01+0000\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/dino/"
 "translations/fi/>\n"
@@ -18,176 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Tervetuloa Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Kirjaudu sisään tai luo tili päästäksesi alkuun."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Ei aktiivisia tilejä"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Hallitse tilejä"
-
-#: 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:338
-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:334
-#, 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 "Lataa %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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s ja %i muuta kirjoittavat"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s ja %s kirjoittavat…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s ja %s kirjoittavat…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s kirjoittaa…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Viesti liian pitkä"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "muokattu"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Hyväksy"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Salaamaton"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Viestiä ei voi lähettää"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d. %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Juuri nyt"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -212,9 +42,21 @@ msgstr "Tiedosto vastaanotettu"
 msgid "Subscription request"
 msgstr "Yhteyspyyntö"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Hylkää"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, fuzzy, c-format
 msgid "Could not connect to %s"
 msgstr "Ei voitu yhdistää: %s"
@@ -238,129 +80,113 @@ msgstr ""
 msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Poista tili %s?"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Minä"
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Poista"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d. %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Valitse keskustelukuvake"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Eilen"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Valitse"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Peruuta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Kuvat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min sitten"
+msgstr[1] "%i min sitten"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Kaikki tiedostot"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Juuri nyt"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Yhdistää…"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Omistaja"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Yhdistetty"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Ylläpitäjä"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Ei yhdistetty"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Jäsen"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Väärä salasana"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Käyttäjä"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "TLS-varmenne ei kelpaa"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Kutsu"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Virhe"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Kutsu ryhmäkeskusteluun"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Lisää tili"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Aloita yksityiskeskustelu"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, fuzzy, c-format
-msgid "Sign in to %s"
-msgstr "Kirjaudu sisään %s-ryhmään"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Potkaise pihalle"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Väärä osoite"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Väärä käyttäjätunnus tai salasana"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Jokin meni pieleen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Palvelin ei vastaa"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Palvelin vatii kirjautumaan verkkosivuston kautta"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Rekisteröity"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Valitse"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "Tarkista %s ohjeet kirjautumiseen"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Peruuta"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Minä"
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr ""
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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/application.vala:200
-#: 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 "Liity"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Lisää"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Aloita keskustelu"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Aloita"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Liity kanavalle"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Lisää"
 msgid "Next"
 msgstr "Seuraava"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Liity"
+
 #: 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 "Takaisin"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Aloita keskustelu"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Aloita"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Yhdistää…"
@@ -450,46 +274,18 @@ msgstr "Valitse jokin muu nimimerkki"
 msgid "Too many occupants in room"
 msgstr "Liikaa käyttäjiä huoneessa"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Omistaja"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Ylläpitäjä"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Jäsen"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Käyttäjä"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Kutsu"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Kutsu ryhmäkeskusteluun"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Aloita yksityiskeskustelu"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Potkaise pihalle"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Väärä osoite"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Lisää"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,8 +304,63 @@ msgstr ""
 msgid "With %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Asetukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Paikalliset asetukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Lähetä kirjoittamisilmoitukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Lähetä lukukuittaukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Ilmoitukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Käytössä"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Pois"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Vain mainittaessa"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Oletus: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,14 @@ msgstr "Ryhmäkeskustelun yksityiskohdat"
 msgid "Contact Details"
 msgstr "Yhteystiedot"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Estä"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Viestit ja tilapäivitykset estetään molempiin suuntiin"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Huoneen nimi"
@@ -553,10 +412,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Salasana"
 
@@ -592,163 +451,266 @@ msgstr "Säilytettyjen viestien enimmäismäärä huoneessa"
 msgid "Room Configuration"
 msgstr "Huoneen asetukset"
 
-#: 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 "Asetukset"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Tervetuloa Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Estä"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Kirjaudu sisään tai luo tili päästäksesi alkuun."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Viestit ja tilapäivitykset estetään molempiin suuntiin"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Ei aktiivisia tilejä"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Hallitse tilejä"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Poista tili %s?"
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Poista"
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Valitse keskustelukuvake"
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Kuvat"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Kaikki tiedostot"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Yhdistää…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Yhdistetty"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Ei yhdistetty"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Väärä salasana"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "TLS-varmenne ei kelpaa"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Virhe"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Lisää tili"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, fuzzy, c-format
+msgid "Sign in to %s"
+msgstr "Kirjaudu sisään %s-ryhmään"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Väärä käyttäjätunnus tai salasana"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Jokin meni pieleen"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Palvelin ei vastaa"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Palvelin vatii kirjautumaan verkkosivuston kautta"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Paikalliset asetukset"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Rekisteröity"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Lähetä kirjoittamisilmoitukset"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Tarkista %s ohjeet kirjautumiseen"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Lähetä lukukuittaukset"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Viesti liian pitkä"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Ilmoitukset"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "muokattu"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Käytössä"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s ja %i muuta kirjoittavat"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Pois"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s ja %s kirjoittavat…"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Vain mainittaessa"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s ja %s kirjoittavat…"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
 #, c-format
-msgid "Default: %s"
-msgstr "Oletus: %s"
+msgid "%s is typing…"
+msgstr "%s kirjoittaa…"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr ""
+#: 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_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr ""
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Viestiä ei voi lähettää"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr ""
+#: 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/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Ilmoita kun uusi viesti saapuu"
+#: 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/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Muuta hymiöt emojeiksi"
+#: 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/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Tilit"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Paikallinen alias"
+#: 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/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Ei asetettuja tilejä"
+#: 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/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Lisää tili"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Lataa %s…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr ""
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Tänään"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr ""
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-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 "Tili"
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
-msgstr ""
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Nimimerkki"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Lisää yhteystieto"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Ilmoita kun uusi viesti saapuu"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Muuta hymiöt emojeiksi"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 #, fuzzy
@@ -783,25 +745,21 @@ msgstr ""
 "Dino hakee historian palvelimelta ja synkronisoi viestit muiden laitteiden "
 "kanssa."
 
-#: 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 "Tili"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Nimimerkki"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Lisää yhteystieto"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr ""
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -827,28 +785,69 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Tilit"
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Paikallinen alias"
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Ei asetettuja tilejä"
+
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Lisää tili"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
 
 #~ msgid "No active conversations"
@@ -857,18 +856,15 @@ msgstr ""
 #~ msgid "Main window with conversations"
 #~ msgstr "Keskustelut pääikkunassa"
 
-#, 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"
 
diff --git a/main/po/fr.po b/main/po/fr.po
index dbad063a..58ff6bc5 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-25 16:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-08 22:32+0000\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
 "fr/>\n"
 "Language: fr\n"
@@ -16,177 +16,7 @@ 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 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Bienvenue dans Dino !"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Connectez-vous ou créez un compte pour commencer."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Configurer le compte"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Aucun compte actif"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gérer les comptes"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s et %i sont en train d’écrire"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s et %s sont en train d’écrire…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s et %s sont en train d’écrire…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s est en train d’écrire…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Message trop long"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "modifié"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Accepter"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non-chiffré"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Impossible d’envoyer le message"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %Hh%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %Hh%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %Hh%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%Hh%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minute environ"
-msgstr[1] "%i minutes environ"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "À l’instant"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -212,12 +42,24 @@ msgstr "Fichier reçu"
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Accepter"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Refuser"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
-msgstr "N’a pas pu se connecter à %s"
+msgstr "Impossible de se connecter à %s"
 
 #: main/src/ui/notifications.vala:129
 #, c-format
@@ -227,7 +69,7 @@ msgstr "Invitation à %s"
 #: main/src/ui/notifications.vala:130
 #, c-format
 msgid "%s invited you to %s"
-msgstr "%s vous a invité·e à %s"
+msgstr "%s vous a invité à %s"
 
 #: main/src/ui/notifications.vala:151
 msgid "Permission request"
@@ -238,160 +80,146 @@ msgstr "Demande de permission"
 msgid "%s requests the permission to write in %s"
 msgstr "%s demande la permission d’écrire dans %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Supprimer le compte %s ?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Supprimer"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Choisir un avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Choisir"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Annuler"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Moi"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Images"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Tous les fichiers"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Hier"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Connexion…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H h %M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Connecté"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Déconnecté"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Il y a %i min"
+msgstr[1] "Il y a %i min"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Mauvais mot de passe"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "À l’instant"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificat TLS invalide"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Propriétaire"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Erreur"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrateur"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Ajouter un compte"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membre"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Se connecter à %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utilisateur"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Vous pouvez maintenant utiliser le compte %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Inviter"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Adresse invalide"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Inviter dans un salon"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Nom d’utilisateur ou mot de passe incorrect"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Commencer une discussion privée"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Quelque chose s’est mal passé"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Éjecter"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Pas de réponse du serveur"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Accorder la permission d’écrire"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "S’inscrire sur %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Révoquer la permission d’écrire"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Sélectionner un fichier"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Ouvrir le site web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Sélectionner"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "S’inscrire"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Annuler"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Moi"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
-msgstr "Cette conférence ne vous autorise pas à envoyer de messages."
+msgstr "Cette conférence ne vous autorise pas à envoyer des messages."
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "Request permission"
 msgstr "Demander la permission"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Rechercher des messages"
 
-#: main/src/ui/application.vala:200
-#: 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 "Rejoindre"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membres"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Commencer une discussion"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Ajouter"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Démarrer"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Rejoindre un salon"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Ajouter"
 msgid "Next"
 msgstr "Suivant"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Rejoindre"
+
 #: 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 "Retour"
 
-#: 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/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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Connexion au salon…"
@@ -428,7 +252,7 @@ msgstr "Mot de passe nécessaire pour rejoindre ce salon"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:175
 msgid "Banned from joining or creating conference"
-msgstr "Vous êtes bannis pour la création ou connexion à ce salon"
+msgstr "Bannissement pour création ou connexion à ce salon"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:177
 msgid "Room does not exist"
@@ -450,46 +274,18 @@ msgstr "Choisissez un autre pseudo"
 msgid "Too many occupants in room"
 msgstr "Trop de participants dans ce salon"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Propriétaire"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrateur"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membre"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utilisateur"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Inviter"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Inviter dans un salon"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Commencer une discussion privée"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Éjecter"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Donner la permission d’écrire"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Adresse invalide"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Révoquer la permission d’écrire"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Ajouter"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,9 +304,64 @@ msgstr "Dans %s"
 msgid "With %s"
 msgstr "Avec %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Sélectionner un fichier"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Paramètres"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Paramètres locaux"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Notifier vos correspondants lorsque vous êtes en train d’écrire"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Envoyer les accusés de réception"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notifications"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Activé"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Désactivé"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Seulement quand mentionné"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Par défaut : %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Demander"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permissions"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Demander la permission d’envoyer des messages"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -520,6 +371,14 @@ msgstr "Informations du salon"
 msgid "Contact Details"
 msgstr "Informations du contact"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquer"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Tous les échanges de messages et de statuts sont bloqués"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nom du salon"
@@ -534,7 +393,7 @@ msgstr "Persistant"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:57
 msgid "The room will persist after the last occupant leaves"
-msgstr "Ce salon persistera après le départ du dernier occupant"
+msgstr "Ce salon persistera après le départ du dernier participant"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Publicly searchable"
@@ -542,7 +401,7 @@ msgstr "Visible publiquement"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Occupants may change the subject"
-msgstr "Les occupants peuvent changer le sujet"
+msgstr "Les participants peuvent changer le sujet"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
 msgid "Permission to view JIDs"
@@ -550,13 +409,13 @@ msgstr "Autorisation de voir les JID"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Who is allowed to view the occupants' JIDs?"
-msgstr "Qui peut voir les JID des participants ?"
+msgstr "Qui peut voir les JID des participants ?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -570,11 +429,13 @@ msgstr "Modéré"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:75
 msgid "Only occupants with voice may send messages"
-msgstr "Seuls les occupants n’étant pas visiteurs peuvent envoyer des messages"
+msgstr ""
+"Seuls les participants avec la permission d’écrire peuvent envoyer des "
+"messages"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Members only"
-msgstr "Seulement les membres"
+msgstr "Membres seulement"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:79
 msgid "Only members may enter the room"
@@ -586,173 +447,276 @@ msgstr "Historique des messages"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:83
 msgid "Maximum amount of backlog issued by the room"
-msgstr "Nombre de messages d’historique retourné par le salon"
+msgstr "Nombre maximum de messages d’historique renvoyé par le salon"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:89
 msgid "Room Configuration"
 msgstr "Configuration du salon"
 
-#: 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 "Paramètres"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Bienvenue dans Dino !"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Bloquer"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Connectez-vous ou créez un compte pour commencer."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Tous les échanges de messages et de statuts sont bloqués"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurer le compte"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Demander"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Aucun compte actif"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permissions"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gérer les comptes"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Demander la permission d’envoyer des messages"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Supprimer le compte %s ?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Paramètres locaux"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Supprimer"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Notifier vos correspondants lorsque vous écrivez"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Sélectionner un avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Envoyer les accusés de réception"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Images"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notifications"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Tous les fichiers"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Activé"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Connexion…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Désactivé"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Connecté"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Seulement quand mentionné"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Déconnecté"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Mauvais mot de passe"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificat TLS invalide"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Erreur"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Ajouter un compte"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Par défaut : %s"
+msgid "Sign in to %s"
+msgstr "Se connecter à %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Rechercher des messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Vous pouvez maintenant utiliser le compte %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membres"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Mauvais nom d’utilisateur ou mot de passe"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Envoyer un fichier"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Quelque chose s’est mal passé"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Mettre à jour le message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Pas de réponse du serveur"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifier l’arrivée de nouveaux messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "S’inscrire sur %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertir les émoticônes en émojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Ce serveur nécessite de s’inscrire depuis un site Web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Comptes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Ouvrir le site Web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alias local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "S’inscrire"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Aucun compte configuré"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Consultez %s pour plus d’informations sur comment s’inscrire"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Ajouter un compte"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Message trop long"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "S’identifier"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "modifié"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Créer un compte"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s et %i autres sont en train d’écrire…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "N’a pas pu établir une connexion sécurisée"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s et %s sont en train d’écrire…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connexion"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s et %s sont en train d’écrire…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Choisissez un serveur public"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s est en train d’écrire…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Ou indiquez l’adresse d’un serveur"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non chiffré"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Connectez-vous à la place"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Impossible d’envoyer le message"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Choisissez un autre serveur"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x %H h %M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Tout est prêt !"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Terminer"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H h %M"
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "À propos de Dino"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H 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/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/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Téléchargement de %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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Aujourd’hui"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Envoyer un fichier"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Mettre à jour le message"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Vous n’avez aucune discussion ouverte"
+
+#: 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 "Compte"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Pseudo"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Ajouter un contact"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifier l’arrivée de nouveaux messages"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertir les frimousses en émojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr "Client XMPP moderne"
+msgstr "Client de clavardage XMPP moderne"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
@@ -760,9 +724,9 @@ msgid ""
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
-"Dino est un client de chat libre et moderne pour le bureau. Il tente de "
-"fournir une expérience Jabber/XMPP simple et fiable tout en ayant toujours à "
-"l’esprit votre vie privée."
+"Dino est un client de clavardage libre et moderne pour le bureau. Il se "
+"concentre sur la fourniture d’une expérience XMPP simple et fiable tout en "
+"ayant toujours à l’esprit votre confidentialité."
 
 #: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
@@ -771,36 +735,32 @@ msgid ""
 "notifications."
 msgstr ""
 "Il prend en charge le chiffrement de bout en bout avec OMEMO et OpenPGP et "
-"permet de configurer les fonctions liées à la vie privée telles que l’accusé "
-"de réception et les notifications de frappe."
+"permet de configurer les fonctions liées à la confidentialité telles que les "
+"accusés de réception et les notifications d’écriture."
 
 #: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
-"Dino récupère l’historique du serveur et synchronise les messages avec "
-"d’autres appareils."
+"Dino récupère l’historique du serveur et synchronise les messages avec les "
+"autres appareils."
 
-#: 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 "Compte"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Pas de recherche en cours"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Pseudo"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Écrivez pour lancer une recherche"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Aucun message correspondant"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Ajouter un contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Vérifiez l’orthographe ou essayez de supprimer des filtres"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -812,7 +772,7 @@ msgstr "Général"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Discussion"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -820,35 +780,76 @@ msgstr "Navigation"
 
 #: main/data/shortcuts.ui:57
 msgid "Jump to next conversation"
-msgstr "Allez à la discussion suivante"
+msgstr "Aller à la discussion suivante"
 
 #: main/data/shortcuts.ui:64
 msgid "Jump to previous conversation"
-msgstr "Revenir à la conversation précédente"
+msgstr "Revenir à la discussion précédente"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Pas de recherche en cours"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Comptes"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Commencez à écrire pour lancer une recherche"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Aucun message correspondant"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "À propos de Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Vérifiez l’orthographe ou essayez de supprimer des filtres"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alias local"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "Cliquer ici pour commencer une discussion ou rejoindre un salon."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Aucun compte configuré"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Vous n’avez aucune discussion ouverte"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Ajouter un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "S’identifier"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Créer un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Impossible d’établir une connexion sécurisée"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connexion"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Choisissez un serveur public"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Ou indiquez l’adresse d’un serveur"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Connectez-vous à la place"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Choisir un autre serveur"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tout est prêt !"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Terminer"
 
 #~ msgid "No active conversations"
 #~ msgstr "Aucune discussion en cours"
@@ -856,11 +857,9 @@ msgstr "Vous n’avez aucune discussion ouverte"
 #~ msgid "Main window with conversations"
 #~ msgstr "Fenêtre principale avec des conversations"
 
-#, 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"
 
@@ -870,11 +869,9 @@ msgstr "Vous n’avez aucune discussion 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"
 
@@ -886,7 +883,6 @@ msgstr "Vous n’avez aucune discussion ouverte"
 #~ msgid "has stopped typing"
 #~ msgstr "a arrêté d’écrire"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i résultats de recherche"
 
diff --git a/main/po/gl.po b/main/po/gl.po
index 5d1a3921..c7aecd62 100644
--- a/main/po/gl.po
+++ b/main/po/gl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-07-02 10:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-03 06:41+0000\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/"
 "translations/gl/>\n"
 "Language: gl\n"
@@ -18,176 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Benvida a Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Conectarse ou crear unha conta para comezar."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Configurar conta"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Sen contas activas"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Xestionar contas"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s e outros %i están a escribir"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s e %s están a escribir…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s e %s están a escribir…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s está a escribir…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mensaxe demasiado longa"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editado"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Aceptar"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non cifrado"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Imposible enviar a mensaxe"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Xusto agora"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -212,9 +42,21 @@ msgstr "Ficheiro recibido"
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Aceptar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Rexeitar"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Non se conectou a %s"
@@ -238,129 +80,113 @@ msgstr "Solicitude de permiso"
 msgid "%s requests the permission to write in %s"
 msgstr "%s pide permiso para escribir en %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Eliminar a conta %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Eliminar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Escoller imaxe do perfil"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Escoller"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Cancelar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Eu"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imaxes"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Tódolos ficheiros"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Onte"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Conectando…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Conectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Desconectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fai %i min"
+msgstr[1] "fai %i minutos"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Contrasinal incorrecto"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Xusto agora"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificado TLS non válido"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Dono"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Erro"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrador"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Engadir conta"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Conectar con %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usuario"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Agora é posible usar a conta %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Convidar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Enderezo non válido"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Convidar ó grupo"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Usuario ou contrasinal incorrectos"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Comezar conversa privada"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Algo fallou"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Botar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Sen resposta do servidor"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Conceder permiso para escribir"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Rexistrarse en %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revogar o permiso de escritura"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Escolle ficheiro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Abrir sitio web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Escoller"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Rexistrar"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Cancelar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Eu"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr "Non tes permiso para escribir en esta sala de conferencia."
 msgid "Request permission"
 msgstr "Solicita permiso"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Buscar mensaxes"
 
-#: main/src/ui/application.vala:200
-#: 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 "Unirse"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membresía"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Comezar conversa"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Engadir"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Comezar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Unirse a unha canle"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Engadir"
 msgid "Next"
 msgstr "Seguinte"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Unirse"
+
 #: 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 "Atrás"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Comezar conversa"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Comezar"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Uníndose…"
@@ -450,46 +274,18 @@ msgstr "Escolle un alcume diferente"
 msgid "Too many occupants in room"
 msgstr "Demasiada xente na sala"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Dono"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrador"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membro"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usuario"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Convidar"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Convidar ó grupo"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Comezar conversa privada"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Botar"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Conceder permiso para escribir"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Enderezo non válido"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revogar o permiso de escritura"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Engadir"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,9 +304,64 @@ msgstr "En %s"
 msgid "With %s"
 msgstr "Con %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Escolle ficheiro"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Axustes"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Axustes locais"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar notificacións ó escribir"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Enviar confirmacións de lectura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificacións"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Activado"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Desactivado"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Só cando te mencionan"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Por omisión: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Solicitar"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permisos"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Solicita permiso para enviar mensaxes"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -520,6 +371,16 @@ msgstr "Detalles do grupo"
 msgid "Contact Details"
 msgstr "Detalles do contacto"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquear"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"As actualizacións do estado e comunicación están bloqueadas en calquera "
+"dirección"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nome da sala"
@@ -553,10 +414,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Quen pode ollar os JIDs dos participantes?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -592,165 +453,266 @@ msgstr "Morea máxima de rexistros fornecidos pola sala"
 msgid "Room Configuration"
 msgstr "Axustes da sala"
 
-#: 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 "Axustes"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Benvida a Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Bloquear"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Conectarse ou crear unha conta para comezar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"As actualizacións do estado e comunicación están bloqueadas en calquera "
-"dirección"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurar conta"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Solicitar"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Sen contas activas"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permisos"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Xestionar contas"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Solicita permiso para enviar mensaxes"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Eliminar a conta %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Axustes locais"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Eliminar"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Enviar notificacións ó escribir"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Escoller imaxe do perfil"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Enviar confirmacións de lectura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imaxes"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificacións"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Tódolos ficheiros"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Activado"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conectando…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Desactivado"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Só cando te mencionan"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Contrasinal incorrecto"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificado TLS non válido"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Erro"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Engadir conta"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Por omisión: %s"
+msgid "Sign in to %s"
+msgstr "Conectar con %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Buscar mensaxes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Agora é posible usar a conta %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membresía"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Usuario ou contrasinal incorrectos"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Enviar ficheiro"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Algo fallou"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Actualizar mensaxe"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Sen resposta do servidor"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notificar cando chega unha nova mensaxe"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Rexistrarse en %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converter risoños a emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "O servidor precisa que te rexistres a través dun sitio web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Contas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Abrir sitio web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alcume local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Rexistrar"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Sen contas configuradas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Olla en %s para máis información sobre o rexistro"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Engadir unha conta"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensaxe demasiado longa"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Conectar"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editado"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crear unha conta"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s e outros %i están escribindo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Non se estableceu unha conexión segura"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s e %s están a escribir…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Conectar"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s e %s están a escribir…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Escoller un servidor público"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s está a escribir…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Ou indicar un enderezo de servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrado"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Iniciar sesión no tocante diso"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Imposible enviar a mensaxe"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Escoller outro servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Todo feito!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Rematar"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Atallos de teclado"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Acerca de Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoxe"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Enviar ficheiro"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Actualizar mensaxe"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Non tes conversas abertas"
+
+#: 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 "Conta"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Sobrenome"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alcume"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Engadir contacto"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar cando chega unha nova mensaxe"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converter risoños a emojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -784,25 +746,21 @@ msgstr ""
 "Dino obtén o histórico dende o servidor e sincroniza as mensaxes con outros "
 "dispositivos."
 
-#: 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 "Conta"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Sen procura activa"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Sobrenome"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Escriba para comezar unha procura"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alcume"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Sen mensaxes coincidentes"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Engadir contacto"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Comprobe a escrita ou tente eliminar filtros"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -814,7 +772,7 @@ msgstr "Xeral"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Conversa"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -828,29 +786,70 @@ msgstr "Ir a seguinte conversa"
 msgid "Jump to previous conversation"
 msgstr "Ir a conversa anterior"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Sen procura activa"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Contas"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Escriba para comezar unha procura"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Sen mensaxes coincidentes"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Acerca de Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Comprobe a escrita ou tente eliminar filtros"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alcume local"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Sen contas configuradas"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Non tes conversas abertas"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Engadir unha conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Conectar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crear unha conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Non se estableceu unha conexión segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Conectar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Escoller un servidor público"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Ou indicar un enderezo de servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Iniciar sesión no tocante diso"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Escoller outro servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Todo feito!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Rematar"
 
 #~ msgid "No active conversations"
 #~ msgstr "Sen conversas activas"
@@ -858,11 +857,9 @@ msgstr "Non tes conversas abertas"
 #~ msgid "Main window with conversations"
 #~ msgstr "Lapela principal con conversas"
 
-#, 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"
 
@@ -872,11 +869,9 @@ msgstr "Non tes conversas abertas"
 #~ 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"
 
@@ -888,7 +883,6 @@ msgstr "Non tes conversas abertas"
 #~ msgid "has stopped typing"
 #~ msgstr "deixou de escribir"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i resultados da procura"
 
diff --git a/main/po/hu.po b/main/po/hu.po
index 141cc3cf..4166f132 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-06-24 11:41+0000\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/"
 "translations/hu/>\n"
@@ -18,381 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Üdvözöljük Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Jelentkezzen be, vagy hozzon létre egy fiókot az induláshoz."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Fiók beállítása"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Nincs aktív fiók"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Fiókok kezelése"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, 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…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr ""
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Kép érkezett"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Az üzenet túl hosszú"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Fájl érkezett"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr ""
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Feliratkozási kérés"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Titkosítatlan"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %I:%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H:%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %I:%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Én"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H:%M"
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Tegnap"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%I:%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "Most"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr ""
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Tulajdonos"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr ""
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Adminisztrátor"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "Kép érkezett"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Tag"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "Fájl érkezett"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Felhasználó"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "Feliratkozási kérés"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Meghívás"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Meghívás a konferenciába"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Privát beszélgetés indítása"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kirúgás"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Eltávolítod a %s fiókot?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Eltávolítás"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Profilkép választása"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr "Választ"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "Mégse"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Képek"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Összes fájl"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Csatlakozás…"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Csatlakozva"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Lecsatlakozva"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Hibás jelszó"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Érvénytelen TLS tanúsítvány"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Hiba"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Fiók hozzáadása"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Jelentkezzen be a %s-ba"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Register on %s"
+msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-msgid "Check %s for information on how to sign up"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Én"
-
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "This conference does not allow you to send messages."
-msgstr ""
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Csevegés kezdeményezése"
 
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "Request permission"
-msgstr ""
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Indítás"
 
-#: main/src/ui/application.vala:200
 #: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
 msgid "Join Channel"
 msgstr "Csatlakozás csatornához"
 
-#: main/src/ui/application.vala:200
-#: 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 "Csatlakozás"
-
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr ""
-
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Hozzáadá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
@@ -401,23 +229,19 @@ msgstr "Hozzáadás"
 msgid "Next"
 msgstr "Következő"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Csatlakozás"
+
 #: 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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: 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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Csatlakozás…"
@@ -450,46 +274,18 @@ 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/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Tulajdonos"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Adminisztrátor"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Tag"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Felhasználó"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Meghívás"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Meghívás a konferenciába"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Privát beszélgetés indítása"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kirúgás"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Hozzáadás"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,8 +304,63 @@ msgstr ""
 msgid "With %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Beállítások"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Helyi beállítások"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Gépelési értesítés küldése"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Kézbesítési jelentés küldése"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Értesítések"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Engedélyezve"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Kikapcsolva"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Csak ha említenek"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Alapértelmezett: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,15 @@ msgstr "A konferencia részletei"
 msgid "Contact Details"
 msgstr "Felhasználó információ"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Tiltás"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"Mind a két irányból le van tiltva a kommunikáció és az állapotjelentések"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "A szoba neve"
@@ -553,10 +413,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Jelszó"
 
@@ -592,165 +452,266 @@ msgstr "A szoba üzenetelőzményeinek maximális mennyisége"
 msgid "Room Configuration"
 msgstr "Szoba beállítása"
 
-#: 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 "Beállítások"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Üdvözöljük Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Tiltás"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Jelentkezzen be, vagy hozzon létre egy fiókot az induláshoz."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Fiók beállítása"
+
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Nincs aktív fiók"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Fiókok kezelése"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Eltávolítod a %s fiókot?"
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Eltávolítás"
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Profilkép választása"
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Képek"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Összes fájl"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Csatlakozás…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Csatlakozva"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Lecsatlakozva"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Hibás jelszó"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Érvénytelen TLS tanúsítvány"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Hiba"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Fiók hozzáadása"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Jelentkezzen be a %s-ba"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
-"Mind a két irányból le van tiltva a kommunikáció és az állapotjelentések"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Helyi beállítások"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Gépelési értesítés küldése"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Kézbesítési jelentés küldése"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Értesítések"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Engedélyezve"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Kikapcsolva"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Az üzenet túl hosszú"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Csak ha említenek"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
 #, c-format
-msgid "Default: %s"
-msgstr "Alapértelmezett: %s"
+msgid "%s, %s and %i others are typing…"
+msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: 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_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: 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/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Értesítés új üzenet érkezésekor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smiley-k átalakítása emojikká"
+#: 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/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Fiókok"
+#: 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/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Helyi név"
+#: 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/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Nincs beállított fiók"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H:%M"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Fiók hozzáadása"
+#: 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/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr ""
+#: 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/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: 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:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Gyorsbillentyűk"
+#: 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 "Fiók"
 
-#: main/data/menu_app.ui:21
-#, fuzzy
-msgid "About Dino"
-msgstr "A Dino névjegye"
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Becenév"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Ismerős hozzáadása"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Értesítés új üzenet érkezésekor"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smiley-k átalakítása emojikká"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -784,25 +745,21 @@ msgstr ""
 "A Dino lekéri a chat előzményeket a szerverről, és szinkronizálja az "
 "üzeneteket a többi eszközzel."
 
-#: 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 "Fiók"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Becenév"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Ismerős hozzáadása"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr ""
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -828,28 +785,70 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Fiókok"
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Gyorsbillentyűk"
+
+#: main/data/menu_app.ui:21
+#, fuzzy
+msgid "About Dino"
+msgstr "A Dino névjegye"
+
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Helyi név"
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nincs beállított fiók"
+
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Fiók hozzáadása"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
 
 #~ msgid "No active conversations"
@@ -858,18 +857,15 @@ msgstr ""
 #~ msgid "Main window with conversations"
 #~ msgstr "A fő ablak a beszélgetésekkel"
 
-#, 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"
 
diff --git a/main/po/ie.po b/main/po/ie.po
index a0376a1d..5cb6f33f 100644
--- a/main/po/ie.po
+++ b/main/po/ie.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-02-04 16:50+0000\n"
 "Language-Team: none\n"
 "Language: ie\n"
@@ -17,176 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.11-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Benevenit a Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Etablisser un conto"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Null activ contos"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gerer contos"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, 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:158
-msgid "Message too long"
-msgstr "Li missage es tre long"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr ""
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Acceptar"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Ínciffrat"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr ""
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%e %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l:%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Strax"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -211,9 +41,21 @@ msgstr "Image es recivet"
 msgid "Subscription request"
 msgstr "Petition de abonnament"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Acceptar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Refusar"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Ne successat conexer a %s"
@@ -237,129 +79,113 @@ msgstr ""
 msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Remover li conto %s?"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Yo"
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Remover"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%e %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Selecte un avatar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Yer"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Selecter"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Anullar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Images"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "ante %i min"
+msgstr[1] "ante %i mins"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Omni files"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Strax"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Conexion…"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Proprietario"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Conexet"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrator"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Disconexet"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membre"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Contrasigne es ínvalid"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usator"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificate TLS es ínvalid"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Invitar"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Errore"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invitar a un conferentie"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Adjunter un conto"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Iniciar un privat conversation"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Inregistrar se in %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Remover"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Adresse es ínvalid"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Contrasigne o nómine ínvalid"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Un errore evenit"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Servitore ne responde"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registrar sur %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Li servitor besona r"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrar"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecter"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "Visita %s por li information pri registration"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Anullar"
 
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Yo"
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Serchar missages"
 
-#: main/src/ui/application.vala:200
-#: 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 "Adherer"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membres"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Iniciar un conversation"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Adjunter"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Iniciar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Adherer al chanele"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "Adjunter"
 msgid "Next"
 msgstr "Avan"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Adherer"
+
 #: 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 "Retro"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar un conversation"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Iniciar"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Adherente…"
@@ -449,46 +273,18 @@ msgstr "Selecte un different nómine"
 msgid "Too many occupants in room"
 msgstr "Tro mult occupantes in li chambre"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Proprietario"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrator"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membre"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usator"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Invitar"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invitar a un conferentie"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Iniciar un privat conversation"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Remover"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Adresse es ínvalid"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Adjunter"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -507,8 +303,63 @@ msgstr "In %s"
 msgid "With %s"
 msgstr "Con %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Parametres"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Local parametres"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Inviar notificationes pri li tippada"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Inviar confirmationes de letion"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificationes"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Yes"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "No"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Solmen quande es mentionat"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Predefinit: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -519,6 +370,14 @@ msgstr "Detallies del conferentie"
 msgid "Contact Details"
 msgstr "Detallies del contacte"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blocar"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Actualisation del communication e statu es blocat in ambi directiones"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nómine del chambre"
@@ -552,10 +411,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Contrasigne"
 
@@ -591,163 +450,266 @@ msgstr "Max númere de old missages gardat per li chambre"
 msgid "Room Configuration"
 msgstr "Configuration del chambre"
 
-#: 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 "Parametres"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Benevenit a Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blocar"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Inregistra vos o crea un conto por iniciar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Actualisation del communication e statu es blocat in ambi directiones"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Etablisser un conto"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Null activ contos"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gerer contos"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Remover li conto %s?"
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Remover"
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Selecte un avatar"
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Images"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Omni files"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conexion…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conexet"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Disconexet"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Contrasigne es ínvalid"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificate TLS es ínvalid"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Errore"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Adjunter un conto"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Inregistrar se in %s"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Local parametres"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Contrasigne o nómine ínvalid"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Inviar notificationes pri li tippada"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Un errore evenit"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Inviar confirmationes de letion"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Servitore ne responde"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificationes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registrar sur %s"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Yes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Li servitor besona r"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "No"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Solmen quande es mentionat"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registrar"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
 #, c-format
-msgid "Default: %s"
-msgstr "Predefinit: %s"
+msgid "Check %s for information on how to sign up"
+msgstr "Visita %s por li information pri registration"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Serchar missages"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Li missage es tre long"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membres"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notificar quande un missage ariva"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr ""
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converter smileys a emojis"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Contos"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ínciffrat"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Local pseudonim"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Null contos etablisset"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Adjunter un conto"
+#: 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/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Inregistrar se"
+#: 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/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crear un conto"
+#: 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/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Ne successat etablisser un secur conexion"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connexer"
+#: 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/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Selecte un public servitore"
+#: 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/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "O provide un adresse de servitore"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Descargante %s…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "O inregistrar se"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s ha ofertat: %s"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Selecte un altri servitore"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "File sta ofertat: %s"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Omni es pret!"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Un file sta ofertat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Finir"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferte de un file ne successat"
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Rapid-tastes"
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hodie"
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Pri Dino"
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Vu ne have apertet conversationes"
+
+#: 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 "Conto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Nómine"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Pseudonim"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Adjunter li contacte"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar quande un missage ariva"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converter smileys a emojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -780,25 +742,21 @@ msgstr ""
 "Dino obtene li diarium del servitore e sincronisa missages inter altri "
 "apparates."
 
-#: 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 "Conto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Null activ sercha"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Nómine"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Tippa por iniciar un sercha"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Pseudonim"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Null correspondent missages"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Adjunter li contacte"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Controla li ortografie o remove filtres"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -824,29 +782,70 @@ msgstr "Ear al sequent conversation"
 msgid "Jump to previous conversation"
 msgstr "Ear al precedent conversation"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Null activ sercha"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Contos"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Tippa por iniciar un sercha"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Rapid-tastes"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Null correspondent missages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Pri Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Controla li ortografie o remove filtres"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Local pseudonim"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Null contos etablisset"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Vu ne have apertet conversationes"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Adjunter un conto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Inregistrar se"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crear un conto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Ne successat etablisser un secur conexion"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connexer"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Selecte un public servitore"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "O provide un adresse de servitore"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "O inregistrar se"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Selecte un altri servitore"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Omni es pret!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Finir"
 
 #~ msgid "No active conversations"
 #~ msgstr "Null activ conversationes"
@@ -854,11 +853,9 @@ msgstr "Vu ne have apertet conversationes"
 #~ msgid "Main window with conversations"
 #~ msgstr "Li primari fenestre con 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"
 
@@ -868,11 +865,9 @@ msgstr "Vu ne have apertet conversationes"
 #~ 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"
 
@@ -884,7 +879,6 @@ msgstr "Vu ne have apertet conversationes"
 #~ msgid "has stopped typing"
 #~ msgstr "ne tippa plu"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "resultates: %i"
 
diff --git a/main/po/it.po b/main/po/it.po
index b55bff14..320fd471 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-06-11 02:41+0000\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
 "translations/it/>\n"
@@ -18,176 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Benvenuto in Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Accedi o crea un account per iniziare."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Configura account"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Nessun account attivo"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gestisci account"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s e %i altri stanno scrivendo"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s e %s stanno scrivendo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s e %s stanno scrivendo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s sta scrivendo…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Messaggio troppo lungo"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "modificato"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Accetta"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non cifrato"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Impossibile inviare il messaggio"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l:%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l:%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l:%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Adesso"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -212,9 +42,21 @@ msgstr "File ricevuto"
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Accetta"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Rifiuta"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Impossibile connettersi a %s"
@@ -238,129 +80,113 @@ msgstr "Richiesta di autorizzazione"
 msgid "%s requests the permission to write in %s"
 msgstr "%s ha chiesto il permesso di scrivere in %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Rimuovere l'account %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Scegli una foto profilo"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Seleziona"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Annulla"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Io"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Immagini"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Tutti i documenti"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ieri"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Connessione…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Connesso"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Disconnesso"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minuto fa"
+msgstr[1] "%i minuti fa"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Password sbagliata"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Adesso"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Il certificato TLS non è valido"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Proprietario"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Errore"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Amministratore"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Aggiungi un account"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Accedi a %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utente"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Ora è possibile iniziare a usare l’account %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Invita"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Indirizzo non valido"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invita alla conferenza"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Nome utente o password sbagliati"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Inizia una conversazione privata"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Qualcosa è andato storto"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Espelli"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Nessuna risposta dal server"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Concedi il permesso di scrivere"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registrati su %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revoca il permesso di scrivere"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Il server richiede di registrarsi tramite un sito web"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Seleziona un file"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Apri il sito web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seleziona"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrati"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Annulla"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Io"
+msgid "%s from %s"
+msgstr "%s da %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr "Questa conferenza non ti permette di inviare messaggi."
 msgid "Request permission"
 msgstr "Richiesta di autorizzazione"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Cerca tra i messaggi"
 
-#: main/src/ui/application.vala:200
-#: 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 "Partecipa"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Partecipanti"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s da %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Inizia una conversazione"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Aggiungi"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Inizia"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Entra nel canale"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Aggiungi"
 msgid "Next"
 msgstr "Avanti"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Partecipa"
+
 #: 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 "Indietro"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Inizia una conversazione"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Inizia"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Accesso in corso…"
@@ -450,46 +274,18 @@ msgstr "Scegli un soprannome differente"
 msgid "Too many occupants in room"
 msgstr "La stanza ha troppi partecipanti"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Proprietario"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Amministratore"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membro"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utente"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Invita"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invita alla conferenza"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Inizia una conversazione privata"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Espelli"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Concedi il permesso di scrivere"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Indirizzo non valido"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revoca il permesso di scrivere"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Aggiungi"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,9 +304,64 @@ msgstr "In %s"
 msgid "With %s"
 msgstr "Con %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Seleziona un file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Impostazioni locali"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Invia notifiche di digitazione"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Invia ricevute di lettura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notifiche"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Attivo"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Disattivo"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Solo se menzionato"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Predefinito: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Richiedi"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permessi"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Richiedi il permesso di inviare messaggi"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -520,6 +371,16 @@ msgstr "Dettagli della conferenza"
 msgid "Contact Details"
 msgstr "Dettagli del contatto"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blocca"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"La comunicazione e gli aggiornamenti di stato sono bloccati in entrambe le "
+"direzioni"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nome della stanza"
@@ -553,10 +414,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Chi è autorizzato a vedere i JID degli occupanti?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Password"
 
@@ -592,165 +453,267 @@ msgstr "Numero massimo di messaggi in cronologia restituiti dalla stanza"
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: 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 "Impostazioni"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Benvenuto in Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blocca"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Accedi o crea un account per iniziare."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"La comunicazione e gli aggiornamenti di stato sono bloccati in entrambe le "
-"direzioni"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configura account"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Richiedi"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Nessun account attivo"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permessi"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gestisci account"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Richiedi il permesso di inviare messaggi"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Rimuovere l'account %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Impostazioni locali"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Invia notifiche di digitazione"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Scegli una foto profilo"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Invia ricevute di lettura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Immagini"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notifiche"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Tutti i documenti"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Attivo"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Connessione…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Disattivo"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Connesso"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Solo se menzionato"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Disconnesso"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Password sbagliata"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Il certificato TLS non è valido"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Errore"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Aggiungi un account"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Predefinito: %s"
+msgid "Sign in to %s"
+msgstr "Accedi a %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Cerca tra i messaggi"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Ora è possibile iniziare a usare l’account %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Partecipanti"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Nome utente o password sbagliati"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Invia un file"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Qualcosa è andato storto"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Aggiorna il messaggio"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Nessuna risposta dal server"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifica quando arriva un nuovo messaggio"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registrati su %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Trasforma le faccine in emoji"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Il server richiede di registrarsi tramite un sito web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Account"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Apri il sito web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alias locale"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registrati"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Nessun account configurato"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Controlla %s per informazioni su come registrarsi"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Aggiungi un account"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Messaggio troppo lungo"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Accedi"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "modificato"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crea account"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s e %i altri stanno scrivendo"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Impossibile stabilire una connessione sicura"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s e %s stanno scrivendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connetti"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s e %s stanno scrivendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Scegli un server pubblico"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s sta scrivendo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Oppure inserisci l'indirizzo di un server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrato"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Altrimenti accedi"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Impossibile inviare il messaggio"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Scegli un altro server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Tutto pronto!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Fine"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Scorciatoie da tastiera"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Informazioni su Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Oggi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Invia un file"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Aggiorna il messaggio"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Non hai chat aperte"
+
+#: 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 "Account"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Soprannome"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Aggiungi contatto"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifica quando arriva un nuovo messaggio"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Trasforma le faccine in emoji"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -784,25 +747,21 @@ msgstr ""
 "Dino recupera la cronologia dal server e sincronizza i messaggi con gli "
 "altri dispositivi."
 
-#: 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 "Account"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Nessuna ricerca attiva"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Soprannome"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Digita per iniziare una ricerca"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Nessun messaggio corrispondente"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Aggiungi contatto"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Controlla l'ortografia o prova a rimuovere dei filtri"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -828,30 +787,70 @@ msgstr "Passa alla conversazione successiva"
 msgid "Jump to previous conversation"
 msgstr "Passa alla conversazione precedente"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Nessuna ricerca attiva"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Account"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Digita per iniziare una ricerca"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Nessun messaggio corrispondente"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Informazioni su Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Controlla l'ortografia o prova a rimuovere dei filtri"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alias locale"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nessun account configurato"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Non hai chat aperte"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Aggiungi un account"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Accedi"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crea account"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Impossibile stabilire una connessione sicura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connetti"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Scegli un server pubblico"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Oppure inserisci l'indirizzo di un server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Altrimenti accedi"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Scegli un altro server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tutto pronto!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Fine"
 
 #~ msgid "No active conversations"
 #~ msgstr "Nessuna conversazione attiva"
@@ -859,11 +858,9 @@ msgstr "Non hai chat aperte"
 #~ msgid "Main window with conversations"
 #~ msgstr "La finestra principale con le conversazioni"
 
-#, 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"
 
@@ -873,11 +870,9 @@ msgstr "Non hai chat 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"
 
@@ -889,7 +884,6 @@ msgstr "Non hai chat aperte"
 #~ msgid "has stopped typing"
 #~ msgstr "ha smesso di scrivere"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i risultati per la ricerca"
 
diff --git a/main/po/ja.po b/main/po/ja.po
index 8f7808dd..faa71d5c 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-05-19 21:41+0000\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/dino/"
 "translations/ja/>\n"
@@ -18,175 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Dino へようこそ！"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "サインインまたはアカウント登録をしてください。"
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "アカウントをセットアップ"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "アクティブなアカウントがありません"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s さん、%s さんに加えて、%i 人のメンバーが入力しています"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s さん、%s さん、%s さんが入力しています…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s さんと %s さんが入力しています…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s さんが入力しています…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "メッセージが長すぎます"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "編集済み"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "承諾"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "非暗号化"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "メッセージを送信できません"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x、%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x、%p %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b%d日、%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a曜日、%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a曜日、%p %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%p %l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分前"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "たった今"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -211,9 +42,21 @@ msgstr "ファイルを受信しました"
 msgid "Subscription request"
 msgstr "在席通知の申込"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "承諾"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "拒否"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "%s に接続できませんでした"
@@ -237,129 +80,112 @@ msgstr "送信権限の要求"
 msgid "%s requests the permission to write in %s"
 msgstr "%s さんが %s での送信権限を要求しています"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "アカウント %s を削除しますか？"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "削除"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "アバターを選択"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "選択"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "キャンセル"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "自分"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "画像"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b%d日"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "すべてのファイル"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "昨日"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "接続試行中…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "接続済み"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%p %l∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "切断"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分前"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "パスワードが違います"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "たった今"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "TLS 証明書が不正です"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "オーナー"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "エラー"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "管理人"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "アカウントを追加"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "メンバー"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "%s にサインイン"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "ユーザー"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "アカウント %s を使用できるようになりました。"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "招待"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "アドレスが不正です"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "トークルームへ招待"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "ユーザー名またはパスワードが違います"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "個人チャットを始める"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "問題が発生しました"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "退出させる"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "サーバーから応答がありません"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "送信権限を許可"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "%s に登録"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "送信権限を取り消す"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "サーバーが Web サイトでのサインアップを要求しています"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "ファイルを選択"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Web サイトを開く"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "選択"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "登録"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "キャンセル"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "サインアップの方法に関する情報は、%s をご確認ください"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "自分"
+msgid "%s from %s"
+msgstr "%2$s の %1$s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr "このトークルームでは、メッセージの送信が許可され
 msgid "Request permission"
 msgstr "送信権限を要求"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "メッセージを検索"
 
-#: main/src/ui/application.vala:200
-#: 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 "参加"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "メンバー"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%2$s の %1$s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "トークを開始"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "追加"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "開始"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "チャンネルに参加"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "追加"
 msgid "Next"
 msgstr "次へ"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "トークを開始"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "開始"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "参加試行中…"
@@ -449,46 +273,18 @@ msgstr "別のニックネームを選んでください"
 msgid "Too many occupants in room"
 msgstr "トークルームの参加者が多すぎます"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "オーナー"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "管理人"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "メンバー"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "ユーザー"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "招待"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "トークルームへ招待"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "個人チャットを始める"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "退出させる"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "送信権限を許可"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "アドレスが不正です"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "送信権限を取り消す"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "追加"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -506,9 +302,64 @@ msgstr "%s での検索結果"
 msgid "With %s"
 msgstr "%s との会話での検索結果"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "ファイルを選択"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "設定"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "ローカル設定"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "入力中であることを通知"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "既読状態を送信"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "通知"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "オン"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "オフ"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "メンションされた場合のみ"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "デフォルト: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "要求"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "送信権限"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "メッセージの送信権限を要求"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -518,6 +369,14 @@ msgstr "トークルームの詳細"
 msgid "Contact Details"
 msgstr "連絡先の詳細"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "ブロック"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "双方のコミュニケーションと状態の更新がブロックされます"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "トークルームの名前"
@@ -551,10 +410,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "参加者の JID を表示できるメンバーを選択します"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "パスワード"
 
@@ -590,163 +449,268 @@ msgstr "保存するトーク履歴の数"
 msgid "Room Configuration"
 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 "設定"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Dino へようこそ！"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "ブロック"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "サインインまたはアカウント登録をしてください。"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "双方のコミュニケーションと状態の更新がブロックされます"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "アカウントをセットアップ"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "要求"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "アクティブなアカウントがありません"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "送信権限"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "アカウントを管理"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "メッセージの送信権限を要求"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "アカウント %s を削除しますか？"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "ローカル設定"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "削除"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "入力中であることを通知"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "アバターを選択"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "既読状態を送信"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "画像"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "通知"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "すべてのファイル"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "オン"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "接続試行中…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "オフ"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "接続済み"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "メンションされた場合のみ"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "切断"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "パスワードが違います"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "TLS 証明書が不正です"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "エラー"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "アカウントを追加"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "デフォルト: %s"
+msgid "Sign in to %s"
+msgstr "%s にサインイン"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "メッセージを検索"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "アカウント %s を使用できるようになりました。"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "メンバー"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "ユーザー名またはパスワードが違います"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "ファイルを送信"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "問題が発生しました"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "メッセージを更新"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "サーバーから応答がありません"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "新しいメッセージが届いたときに通知"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "%s に登録"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "スマイリーを絵文字に変換"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "サーバーが Web サイトでのサインアップを要求しています"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "アカウント"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Web サイトを開く"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "ローカルでの別名"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "登録"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "アカウントが設定されていません"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "サインアップの方法に関する情報は、%s をご確認ください"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "アカウントを追加"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "メッセージが長すぎます"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "サインイン"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "編集済み"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "アカウントを作成"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s さん、%s さんに加えて、%i 人のメンバーが入力しています"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "安全な接続を確立できませんでした"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s さん、%s さん、%s さんが入力しています…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "接続"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s さんと %s さんが入力しています…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "公開サーバーを選択"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s さんが入力しています…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "または、サーバーのアドレスを手入力"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "非暗号化"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "代わりにサインイン"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "メッセージを送信できません"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "別のサーバーを選択"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x、%H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "すべてのセットアップが完了しました！"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "完了"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Dino について"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "この相手があなたを連絡先に入れようとしています"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今日"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b%d日 (%a)"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "ファイルを送信"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "メッセージを更新"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+"トークを始めたりトークルームに参加したりするには、ここをクリックしてくださ"
+"い。"
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 "アカウント"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "ニックネーム"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "別名"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "連絡先を追加"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "新しいメッセージが届いたときに通知"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "スマイリーを絵文字に変換"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -778,25 +742,21 @@ msgid ""
 msgstr ""
 "Dino はサーバーから履歴を取得し、ほかのデバイスとメッセージを同期します。"
 
-#: 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 "アカウント"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "まだ検索していません"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "ニックネーム"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "入力して検索を開始してください"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "別名"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "一致するメッセージはありません"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "連絡先を追加"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "スペルを確認するか、フィルターを消去してみてください"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -822,31 +782,70 @@ msgstr "次のトークへ移動"
 msgid "Jump to previous conversation"
 msgstr "前のトークへ移動"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "まだ検索していません"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "アカウント"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "入力して検索を開始してください"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "一致するメッセージはありません"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Dino について"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "スペルを確認するか、フィルターを消去してみてください"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "ローカルでの別名"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr ""
-"トークを始めたりトークルームに参加したりするには、ここをクリックしてくださ"
-"い。"
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "アカウントが設定されていません"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "表示するトークはまだありません"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "アカウントを追加"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "サインイン"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "アカウントを作成"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "安全な接続を確立できませんでした"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "接続"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "公開サーバーを選択"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "または、サーバーのアドレスを手入力"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "代わりにサインイン"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "別のサーバーを選択"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "すべてのセットアップが完了しました！"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "完了"
 
 #~ msgid "No active conversations"
 #~ msgstr "アクティブなトークがありません"
@@ -854,11 +853,9 @@ msgstr "表示するトークはまだありません"
 #~ msgid "Main window with conversations"
 #~ msgstr "トーク中のメインウィンドウ"
 
-#, c-format
 #~ msgid "%s, %s and %i others"
 #~ msgstr "%s さん、%s さんとその他 %i 人"
 
-#, c-format
 #~ msgid "You can now start using %s"
 #~ msgstr "%s をお使いいただけます"
 
@@ -868,11 +865,9 @@ msgstr "表示するトークはまだありません"
 #~ msgid "Save"
 #~ msgstr "保存"
 
-#, c-format
 #~ msgid "%s, %s and %s"
 #~ msgstr "%s さん、%s さんと %s さん"
 
-#, c-format
 #~ msgid "%s and %s"
 #~ msgstr "%s さんと %s さん"
 
@@ -883,7 +878,6 @@ msgstr "表示するトークはまだありません"
 #~ msgid "has stopped typing"
 #~ msgstr "が入力を中断しました"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i 件の検索結果"
 
diff --git a/main/po/ko.po b/main/po/ko.po
new file mode 100644
index 00000000..3f1cef42
--- /dev/null
+++ b/main/po/ko.po
@@ -0,0 +1,839 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-08 22:32+0000\n"
+"Language-Team: none\n"
+"Language: ko\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 4.2-dev\n"
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr ""
+
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr ""
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr ""
+
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr ""
+
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
+
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: 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:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "어제"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 분 이전에"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "방금 전"
+
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr ""
+
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "초대"
+
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr ""
+
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr ""
+
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "파일 선택"
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "선택"
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "취소"
+
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr ""
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
+msgstr ""
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "대화 시작"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "시작"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+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
+#: main/data/manage_accounts/add_account_dialog.ui:410
+#: main/data/manage_accounts/add_account_dialog.ui:490
+msgid "Next"
+msgstr "다음"
+
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/conference_details_fragment.vala:149
+msgid "Joining…"
+msgstr "참가 중…"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:170
+msgid "Password required to enter room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:175
+msgid "Banned from joining or creating conference"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:177
+msgid "Room does not exist"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:179
+msgid "Not allowed to create room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:181
+msgid "Members-only room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:184
+msgid "Choose a different nick"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:186
+msgid "Too many occupants in room"
+msgstr ""
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "추가"
+
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] "%i 개의 검색 결과"
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
+msgstr ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "설정"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "켜기"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "끄기"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr ""
+
+#: main/src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr ""
+
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
+msgid "Contact Details"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:50
+msgid "Name of the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:53
+msgid "Description of the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
+msgid "Persistent"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:57
+msgid "The room will persist after the last occupant leaves"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
+msgid "Publicly searchable"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Occupants may change the subject"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Permission to view JIDs"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:70
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
+msgid "Password"
+msgstr "비밀번호"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "A password to restrict access to the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Moderated"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Only occupants with voice may send messages"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
+msgid "Members only"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:79
+msgid "Only members may enter the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:82
+msgid "Message history"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:83
+msgid "Maximum amount of backlog issued by the room"
+msgstr ""
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:89
+msgid "Room Configuration"
+msgstr ""
+
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Dino에 오신 것을 환영합니다!"
+
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "로그인 또는 계정을 생성 하십시오."
+
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "계정 설정"
+
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "활성화 된 계정이 없습니다"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "계정 관리"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "이미지"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "모든 파일"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "연결 중…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "연결 됨"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "연결 해제 됨"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "잘못 된 비밀번호"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "계정 추가"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "웹사이트 열기"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "등록"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+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:185
+msgid "edited"
+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 "%s 와(과) %s, %s이(가) 입력 중…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s 와(과) %s 이(가) 입력 중…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s 이(가) 입력 중…"
+
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "오늘"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:8
+msgid "Modern XMPP Chat Client"
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:10
+msgid ""
+"Dino is a modern open-source chat client for the desktop. It focuses on "
+"providing a clean and reliable Jabber/XMPP experience while having your "
+"privacy in mind."
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:11
+msgid ""
+"It supports end-to-end encryption with OMEMO and OpenPGP and allows "
+"configuring privacy-related features such as read receipts and typing "
+"notifications."
+msgstr ""
+
+#: main/data/im.dino.Dino.appdata.xml.in:12
+msgid ""
+"Dino fetches history from the server and synchronizes messages with other "
+"devices."
+msgstr ""
+
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr ""
+
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr ""
+
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr ""
+
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr ""
+
+#: main/data/file_send_overlay.ui:80
+msgid "Send"
+msgstr ""
+
+#: main/data/shortcuts.ui:12
+msgid "General"
+msgstr ""
+
+#: main/data/shortcuts.ui:32
+msgid "Conversation"
+msgstr ""
+
+#: main/data/shortcuts.ui:52
+msgid "Navigation"
+msgstr ""
+
+#: main/data/shortcuts.ui:57
+msgid "Jump to next conversation"
+msgstr ""
+
+#: main/data/shortcuts.ui:64
+msgid "Jump to previous conversation"
+msgstr ""
+
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr ""
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr ""
+
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr ""
diff --git a/main/po/lb.po b/main/po/lb.po
index 02b59f33..49eb9e69 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-04-15 00:11+0000\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
 "translations/lb/>\n"
@@ -13,349 +13,175 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Wëllkomm bei Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Konto opsetzen"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Keng Kontoen aktiv"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Kontoe managen"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s an %i anerer sinn um schreiwen"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s an %s sinn um schreiwen…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "Bild geschéckt"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s an %s sinn um schreiwen…"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "Datei geschéckt"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s ass um schreiwen…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Bild kritt"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Noriicht ze laang"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Datei kritt"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "beaarbecht"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Abonnement Ufro"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akzeptéieren"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onverschlësselt"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "Konnt net op %s connectéieren"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Konnt de Message net schécken"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr "Aluedung an %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H:%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr "%s huet dech zu %s agelueden"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l:%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H:%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l:%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ech"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Gëschter"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "Just elo"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr "Bild geschéckt"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Besëtzer"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr "Datei geschéckt"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrateur"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "Bild kritt"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Member"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "Datei kritt"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Benotzer"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "Abonnement Ufro"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Alueden"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr "Konnt net op %s connectéieren"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invitéieren an Konferenz"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr "Aluedung an %s"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Privat Conversatioun starten"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr "%s huet dech zu %s agelueden"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Erausgeheien"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Konto %s läschen?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Läschen"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Avatar auswielen"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr "Auswielen"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "Ofbriechen"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Biller"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "All Dateien"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Verbannen…"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Verbonnen"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Getrennt"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Falsch Passwuert"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Invaliden TLS Zertifikat"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Feeler"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Account bäisetzen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Bei %s umellen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Du kanns elo den Account %s benotzen."
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Ongülteg Adress"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Falsche Benotzernumm oder Passwuert"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Eppes ass schif gaangen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Keng Äntwert vum Server"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Ob %s registréieren"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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 website"
-msgstr "Websäit opmaachen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registréieren"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ech"
+msgid "%s from %s"
+msgstr "%s vum %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -365,28 +191,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Messagen duerchsichen"
 
-#: main/src/ui/application.vala:200
-#: 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 "Bäitrieden"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Memberen"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s vum %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Konversatioun starten"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Bäisetzen"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Start"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanal bäitrieden"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -396,23 +224,19 @@ msgstr "Bäisetzen"
 msgid "Next"
 msgstr "Nächst"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Bäitrieden"
+
 #: 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 "Zeréck"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Konversatioun starten"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Start"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Bäitrieden…"
@@ -445,46 +269,18 @@ msgstr "Wiel een anere Spëtznumm"
 msgid "Too many occupants in room"
 msgstr "De Raum huet ze vill Benotzer"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Besëtzer"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrateur"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Member"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Benotzer"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Alueden"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invitéieren an Konferenz"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Privat Conversatioun starten"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Erausgeheien"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Ongülteg Adress"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Bäisetzen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -503,8 +299,63 @@ msgstr "An %s"
 msgid "With %s"
 msgstr "Mat %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Astellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokal Astellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Tipp-Notifikatioune schécken"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Scheck Lies Bestätegungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notifikatiounen"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Un"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Aus"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Nëmme wann erwäänt"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Standard: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -515,6 +366,14 @@ msgstr "Konferenz Detailer"
 msgid "Contact Details"
 msgstr "Kontaktdetailer"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blockéieren"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Kommunikatioun a Status Updates sinn an all Richtung blockéiert"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Numm vum Raum"
@@ -548,10 +407,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Wien ass erlaabt den Gäscht hier JIDs ze gesinn?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Passwuert"
 
@@ -587,163 +446,267 @@ msgstr "Maximal Unzuel vum ale Messagen, déi vum Raum geschéckt ginn"
 msgid "Room Configuration"
 msgstr "Raum Astellungen"
 
-#: 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 "Astellungen"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Wëllkomm bei Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blockéieren"
+#: main/src/ui/main_window.vala:199
+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/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Kommunikatioun a Status Updates sinn an all Richtung blockéiert"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Konto opsetzen"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Keng Kontoen aktiv"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Kontoe managen"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Konto %s läschen?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokal Astellungen"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Läschen"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Tipp-Notifikatioune schécken"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Avatar auswielen"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Scheck Lies Bestätegungen"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Biller"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notifikatiounen"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "All Dateien"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Un"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Verbannen…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Aus"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Verbonnen"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Nëmme wann erwäänt"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Getrennt"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Falsch Passwuert"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Invaliden TLS Zertifikat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Feeler"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Account bäisetzen"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Standard: %s"
+msgid "Sign in to %s"
+msgstr "Bei %s umellen"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Messagen duerchsichen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Du kanns elo den Account %s benotzen."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Memberen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Falsche Benotzernumm oder Passwuert"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Eppes ass schif gaangen"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "De Message updaten"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Keng Äntwert vum Server"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Benoriichtege wann een neie Message ukënnt"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Ob %s registréieren"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileyen an Emojien konvertéieren"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "De Server setzt eng Registréierung duerch eng Websäit viraus"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Kontoen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Websäit opmaachen"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokalen Pseudonym"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registréieren"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Keng Kontoe konfiguréiert"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Kuck %s fir Informatioune iwwert Registréierung"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Ee Konto bäisetzen"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Noriicht ze laang"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Aloggen"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "beaarbecht"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Account kreéieren"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s an %i anerer sinn um schreiwen"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Konnt keng geséchert Verbindung opbauen"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s an %s sinn um schreiwen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connectéieren"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s an %s sinn um schreiwen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Ëffentleche Server auswielen"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s ass um schreiwen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Oder spezifizéier eng Server Adress"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onverschlësselt"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Aloggen a Platz"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Konnt de Message net schécken"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Anere Server auswielen"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Alles ageriicht!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Ofschléissen"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturofkierzungen"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Iwwert Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Haut"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "De Message updaten"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Du hues keng oppen Chats"
+
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Spëtznumm"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Pseudonym"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Kontakt bäisetzen"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Benoriichtege wann een neie Message ukënnt"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileyen an Emojien konvertéieren"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -776,25 +739,21 @@ msgstr ""
 "Dino rifft  Gespréichverläf vum Server of a synchroniséiert Noriichte mat "
 "anere Geräter."
 
-#: 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Keng aktiv Sich"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Spëtznumm"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Tipp fir eng Sich ze starten"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Pseudonym"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Keng Message fonnt"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Kontakt bäisetzen"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Iwwerpréif Schreifweis oder läsch Filteren"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -820,30 +779,70 @@ msgstr "Zu nächster Konversatioun sprangen"
 msgid "Jump to previous conversation"
 msgstr "Zu viregter Konversatioun sprangen"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Keng aktiv Sich"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Kontoen"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Tipp fir eng Sich ze starten"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturofkierzungen"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Keng Message fonnt"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Iwwert Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Iwwerpréif Schreifweis oder läsch Filteren"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokalen Pseudonym"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Keng Kontoe konfiguréiert"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Du hues keng oppen Chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Ee Konto bäisetzen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Aloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Account kreéieren"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Konnt keng geséchert Verbindung opbauen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connectéieren"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Ëffentleche Server auswielen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Oder spezifizéier eng Server Adress"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Aloggen a Platz"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Anere Server auswielen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Alles ageriicht!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Ofschléissen"
 
 #~ msgid "No active conversations"
 #~ msgstr "Keng Conversatiounen aktiv"
@@ -851,11 +850,9 @@ msgstr "Du hues keng oppen Chats"
 #~ msgid "Main window with conversations"
 #~ msgstr "Haaptfënster mat den Conversatiounen"
 
-#, 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"
 
@@ -865,11 +862,9 @@ msgstr "Du hues keng oppen Chats"
 #~ 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"
 
@@ -881,7 +876,6 @@ msgstr "Du hues keng oppen Chats"
 #~ msgid "has stopped typing"
 #~ msgstr "huet opgehalen ze tippen"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i Sichresultater"
 
diff --git a/main/po/lt.po b/main/po/lt.po
index 95946980..718b5f16 100644
--- a/main/po/lt.po
+++ b/main/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-07-04 15:41+0000\n"
 "Language-Team: none\n"
 "Language: lt\n"
@@ -18,177 +18,6 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Sveiki atvykę į Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Nusistatyti paskyrą"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Aktyvių paskyrų nėra"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Tvarkyti paskyras"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s ir dar %i rašo"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s ir %s rašo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s ir %s rašo…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s rašo…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Žinutė per ilga"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "redaguota"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Priimti"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Nešifruota"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Nepavyko išsiųsti žinutės"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Ką tik"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -213,9 +42,21 @@ msgstr "Failas gautas"
 msgid "Subscription request"
 msgstr "Prenumeratos užklausa"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Priimti"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Atmesti"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Nepavyko prisijungti prie %s"
@@ -239,129 +80,114 @@ msgstr "Leidimo užklausa"
 msgid "%s requests the permission to write in %s"
 msgstr "%s prašo leidimo rašyti ties %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Šalinti paskyrą %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Šalinti"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Pasirinkti avatarą"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Pasirinkti"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Atsisakyti"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Aš"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Paveikslai"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Visi failai"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Vakar"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Jungiamasi…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Prisijungta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Atsijungta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, 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/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Neteisingas slaptažodis"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Ką tik"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Negaliojantis TLS liudijimas"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Savininkas"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Klaida"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administratorius"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Pridėti paskyrą"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Narys"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Prisijungti prie %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Naudotojas"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Dabar galite naudoti paskyrą %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Pakviesti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Neteisingas adresas"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Pakviesti į konferenciją"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Neteisingas naudotojo vardas ar slaptažodis"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Pradėti privatų pokalbį"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Kažkas nutiko"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Išvaryti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Nėra atsakymo iš serverio"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Suteikti leidimą rašyti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registruotis %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Panaikinti leidimą rašyti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Serveris reikalauja registruotis per internetinę svetainę"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Pasirinkti failą"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Atverti internetinę svetainę"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Pasirinkti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registruotis"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Atsisakyti"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Aš"
+msgid "%s from %s"
+msgstr "%s iš %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -371,28 +197,30 @@ msgstr "Ši konferencija jums neleidžia siųsti žinučių."
 msgid "Request permission"
 msgstr "Užklausti leidimo"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Ieškoti žinučių"
 
-#: main/src/ui/application.vala:200
-#: 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 "Prisijungti"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Nariai"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s iš %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Pradėti pokalbį"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Pridėti"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Pradėti"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Prisijungti prie kanalo"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -402,23 +230,19 @@ msgstr "Pridėti"
 msgid "Next"
 msgstr "Kitas"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Prisijungti"
+
 #: 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 "Atgal"
 
-#: 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/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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Prisijungiama…"
@@ -451,46 +275,18 @@ msgstr "Pasirinkti kitą slapyvardį"
 msgid "Too many occupants in room"
 msgstr "Kambaryje per daug žmonių"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Savininkas"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administratorius"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Narys"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Naudotojas"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Pakviesti"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Pakviesti į konferenciją"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Pradėti privatų pokalbį"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Išvaryti"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Suteikti leidimą rašyti"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Neteisingas adresas"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Panaikinti leidimą rašyti"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Pridėti"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -510,9 +306,64 @@ msgstr "Ties %s"
 msgid "With %s"
 msgstr "Su %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Pasirinkti failą"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Nustatymai"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Vietiniai nustatymai"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Siųsti pranešimus apie žinutės rašymą"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Siųsti pranešimus apie žinučių skaitymą"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Pranešimai"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Įjungta"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Išjungta"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Tik paminėjus"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Pagal numatymą: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -522,6 +373,15 @@ msgstr "Išsamiau apie konferenciją"
 msgid "Contact Details"
 msgstr "Išsamiau apie adresatą"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+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"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Kambario pavadinimas"
@@ -555,10 +415,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -594,164 +454,266 @@ msgstr "Didžiausias kambario išduodamas praeities žurnalo skaičius"
 msgid "Room Configuration"
 msgstr "Kambario konfigūracija"
 
-#: 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 "Nustatymai"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Sveiki atvykę į Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blokuoti"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Norėdami pradėti, prisijunkite arba susikurkite paskyrą."
 
-#: 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"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Nusistatyti paskyrą"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Aktyvių paskyrų nėra"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Tvarkyti paskyras"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Šalinti paskyrą %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Vietiniai nustatymai"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Šalinti"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Siųsti pranešimus apie žinutės rašymą"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Pasirinkti avatarą"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Siųsti pranešimus apie žinučių skaitymą"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Paveikslai"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Pranešimai"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Visi failai"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Įjungta"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Jungiamasi…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Išjungta"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Prisijungta"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Tik paminėjus"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Atsijungta"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Neteisingas slaptažodis"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Negaliojantis TLS liudijimas"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Klaida"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Pridėti paskyrą"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Pagal numatymą: %s"
+msgid "Sign in to %s"
+msgstr "Prisijungti prie %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Ieškoti žinučių"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Dabar galite naudoti paskyrą %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Nariai"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Neteisingas naudotojo vardas ar slaptažodis"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Kažkas nutiko"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Nėra atsakymo iš serverio"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Pranešti, kai gaunama nauja žinutė"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registruotis %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Keisti šypsenėles į jaustukus"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Serveris reikalauja registruotis per internetinę svetainę"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Paskyros"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Atverti internetinę svetainę"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Vietinis pseudonimas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registruotis"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Nėra sukonfigūruotų paskyrų"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Išsamesnei informacijai apie registraciją, žiūrėkite %s"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Pridėti paskyrą"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Žinutė per ilga"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Prisijungti"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "redaguota"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Sukurti paskyrą"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s ir dar %i rašo"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Nepavyko užmegzti saugaus ryšio"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s ir %s rašo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Prisijungti"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s ir %s rašo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Pasirinkite viešąjį serverį"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s rašo…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Arba nurodykite serverio adresą"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Nešifruota"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Vietoj to, prisijungti"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Nepavyko išsiųsti žinutės"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Pasirinkti kitą serverį"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Viskas nustatyta!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Užbaigti"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Trumpiniai"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Apie Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Šiandien"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b %d, %a"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Neturite jokių atvertų pokalbių"
+
+#: 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 "Paskyra"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Slapyvardis"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Pseudonimas"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Pridėti adresatą"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Pranešti, kai gaunama nauja žinutė"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Keisti šypsenėles į jaustukus"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -785,25 +747,21 @@ msgstr ""
 "Dino gauna istoriją iš serverio ir sinchronizuoja žinutes su kitais "
 "įrenginiais."
 
-#: 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 "Paskyra"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Nėra aktyvios paieškos"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Slapyvardis"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Rašykite norėdami atlikti paiešką"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Pseudonimas"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Nėra atitinkančių žinučių"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Pridėti adresatą"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Patikrinkite rašybą arba pabandykite pašalinti filtrus"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -829,29 +787,70 @@ msgstr "Peršokti prie kito pokalbio"
 msgid "Jump to previous conversation"
 msgstr "Peršokti prie ankstesnio pokalbio"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Nėra aktyvios paieškos"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Paskyros"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Rašykite norėdami atlikti paiešką"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Trumpiniai"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Nėra atitinkančių žinučių"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Apie Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Patikrinkite rašybą arba pabandykite pašalinti filtrus"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Vietinis pseudonimas"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nėra sukonfigūruotų paskyrų"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Neturite jokių atvertų pokalbių"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Pridėti paskyrą"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Prisijungti"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Sukurti paskyrą"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Nepavyko užmegzti saugaus ryšio"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Prisijungti"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Pasirinkite viešąjį serverį"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Arba nurodykite serverio adresą"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Vietoj to, prisijungti"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Pasirinkti kitą serverį"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Viskas nustatyta!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Užbaigti"
 
 #~ msgid "No active conversations"
 #~ msgstr "Aktyvių pokalbių nėra"
@@ -859,11 +858,9 @@ msgstr "Neturite jokių atvertų pokalbių"
 #~ msgid "Main window with conversations"
 #~ msgstr "Pagrindinis langas su pokalbiais"
 
-#, 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"
 
@@ -873,11 +870,9 @@ msgstr "Neturite jokių atvertų pokalbių"
 #~ 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"
 
@@ -890,7 +885,6 @@ msgstr "Neturite jokių atvertų pokalbių"
 #~ msgid "has stopped typing"
 #~ msgstr "nustojo rašyti"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "Paieškos rezultatų: %i"
 
diff --git a/main/po/nb.po b/main/po/nb.po
index 159c6e77..7091d515 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-19 21:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-03 06:41+0000\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
 "translations/nb_NO/>\n"
 "Language: nb\n"
@@ -16,177 +16,7 @@ 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 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Velkommen til Dino."
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Sett opp konto"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Ingen kontoer aktive"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Behandle kontoer"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s og %i andre skriver"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s og %s skriver…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s og %s skriver…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s skriver…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Meldingen er for lang"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "redigert"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Godta"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Kunneikke sende melding"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Akkurat nå"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -212,9 +42,21 @@ msgstr "Fil mottatt"
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Godta"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Nekt"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Kunne ikke koble til %s"
@@ -238,129 +80,113 @@ msgstr "Tilgangsforespørsel"
 msgid "%s requests the permission to write in %s"
 msgstr "%s forespør tilgang til å skrive til %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Fjern konto %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Fjern"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Velg avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Velg"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Avbryt"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Meg"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Bilder"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Alle filer"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "I går"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Kobler til…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Tilkoblet"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Frakoblet"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minutt siden"
+msgstr[1] "%i minutter siden"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Feil passord"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Akkurat nå"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Ugyldig TLS-sertifikat"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eier"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Feil"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Legg til konto"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Medlem"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Logg inn på %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Bruker"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Du kan nå bruke kontoen %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Inviter"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Ugyldig adresse"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Inviter til konferanse"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Feil brukernavn eller passord"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Start privat samtale"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Noe gikk galt"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kast ut"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Inget svar fra tjener"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Innvilg skrivetilgang"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registrer på %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Tilbakekall skrivetilgang"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Tjeneren krever at man logger inn via en nettside"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Velg fil"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Åpne nettside"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Velg"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrer"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Avbryt"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Meg"
+msgid "%s from %s"
+msgstr "%s fra %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -370,28 +196,30 @@ msgstr "Du tillates ikke å sende meldinger i denne konferansen."
 msgid "Request permission"
 msgstr "Forespør tilgang"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Søk i meldinger"
 
-#: main/src/ui/application.vala:200
-#: 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 "Ta del"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Medlemmer"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s fra %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Start samtale"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Legg til"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Start"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Ta del i kanal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,23 +229,19 @@ msgstr "Legg til"
 msgid "Next"
 msgstr "Neste"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Ta del"
+
 #: 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 "Tilbake"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Start samtale"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Start"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Tar del…"
@@ -450,46 +274,18 @@ msgstr "Velg et annet kallenavn"
 msgid "Too many occupants in room"
 msgstr "Rommet har for mange deltagere"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eier"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Admin"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Medlem"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Bruker"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Inviter"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Inviter til konferanse"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Start privat samtale"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kast ut"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Innvilg skrivetilgang"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Ugyldig adresse"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Tilbakekall skrivetilgang"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Legg til"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,9 +304,64 @@ msgstr "I %s"
 msgid "With %s"
 msgstr "Med %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Velg fil"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale innstillinger"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Send skrivevarsling"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Send meldingskvitteringer"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Merknader"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "På"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Av"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Bare når nevnt"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Forvalg: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Forespør"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Tilganger"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Forespør tilgang til meldingsforsendelse"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -520,6 +371,14 @@ msgstr "Konferansedetaljer"
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokker"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Kommunikasjon og statusoppdateringer i begge retninger er blokkert"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Romnavn"
@@ -553,10 +412,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Hvem skal tillates å vise brukernes JID-er?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Passord"
 
@@ -592,163 +451,266 @@ msgstr "Maksimalt mengde historikk som skal utstedes av rommet"
 msgid "Room Configuration"
 msgstr "Rom-oppsett"
 
-#: 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 "Innstillinger"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Velkommen til Dino."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blokker"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Logg inn eller opprett en konto for å starte."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Kommunikasjon og statusoppdateringer i begge retninger er blokkert"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Sett opp konto"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Forespør"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Ingen kontoer aktive"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Tilganger"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Behandle kontoer"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Forespør tilgang til meldingsforsendelse"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Fjern konto %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokale innstillinger"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Fjern"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Send skrivevarsling"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Velg avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Send meldingskvitteringer"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Bilder"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Merknader"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Alle filer"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "På"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Kobler til…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Av"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Tilkoblet"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Bare når nevnt"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Frakoblet"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Ugyldig TLS-sertifikat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Feil"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Legg til konto"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Forvalg: %s"
+msgid "Sign in to %s"
+msgstr "Logg inn på %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Søk i meldinger"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Du kan nå bruke kontoen %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Medlemmer"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Feil brukernavn eller passord"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Send fil"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Noe gikk galt"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Oppdater melding"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Inget svar fra tjener"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Varsle ved mottak av ny melding"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registrer på %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Konverter smilefjes til emoji-er"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Tjeneren krever at man logger inn via en nettside"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Kontoer"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Åpne nettside"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokalt alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registrer"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Ingen kontoer satt opp"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Se %s for å lære hvordan du registrerer deg"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Legg til en konto"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Meldingen er for lang"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Logg inn"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "redigert"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Opprett konto"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s og %i andre skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Kunne ikke etablere sikker forbindelse"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s og %s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Koble til"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s og %s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Velg en offentlig tjener"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Eller angi en tjeneradresse"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ukryptert"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Logg inn istedenfor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Kunneikke sende melding"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Velg en annen tjener"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Ferdig oppsatt."
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Fullfør"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Tastatursnarveier"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Om Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "I dag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Send fil"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Oppdater melding"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Du har ingen åpne sludringer"
+
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Kallenavn"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Legg til kontakt"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Varsle ved mottak av ny melding"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Konverter smilefjes til emoji-er"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -782,25 +744,21 @@ msgstr ""
 "Dino henter historikk fra tjeneren og synkroniserer meldinger med andre "
 "enheter."
 
-#: 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Inget aktivt søk"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Kallenavn"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Skriv for å starte et søk"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Ingen samsvarende meldinger"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Legg til kontakt"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Sjekk stavingen eller prøv å fjerne filter"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -812,7 +770,7 @@ msgstr "Generelt"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Samtale"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -826,29 +784,70 @@ msgstr "Hopp til neste samtale"
 msgid "Jump to previous conversation"
 msgstr "Hopp til forrige samtale"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Inget aktivt søk"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Skriv for å starte et søk"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Ingen samsvarende meldinger"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Om Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Sjekk stavingen eller prøv å fjerne filter"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokalt alias"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Ingen kontoer satt opp"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Du har ingen åpne sludringer"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Legg til en konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Logg inn"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Opprett konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Kunne ikke etablere sikker forbindelse"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Koble til"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Velg en offentlig tjener"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Eller angi en tjeneradresse"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Logg inn istedenfor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Velg en annen tjener"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Ferdig oppsatt."
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Fullfør"
 
 #~ msgid "No active conversations"
 #~ msgstr "Ingen kontoer aktive"
@@ -856,11 +855,9 @@ msgstr "Du har ingen åpne sludringer"
 #~ msgid "Main window with conversations"
 #~ msgstr "Hovedvindu med samtaler"
 
-#, 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"
 
@@ -870,11 +867,9 @@ msgstr "Du har ingen åpne sludringer"
 #~ 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"
 
@@ -886,7 +881,6 @@ msgstr "Du har ingen åpne sludringer"
 #~ msgid "has stopped typing"
 #~ msgstr "har tatt pause i skrivinga"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i søkeresultater"
 
diff --git a/main/po/nl.po b/main/po/nl.po
index 5c81a335..7e21949d 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-01-16 00:21+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-09-05 19:21+0000\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
 "nl/>\n"
 "Language: nl\n"
@@ -16,382 +16,210 @@ 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.11-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Welkom bij Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Account instellen"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Geen accounts actief"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Accounts beheren"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, 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/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "Afbeelding verstuurd"
 
-#: 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:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "Bestand verstuurd"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr ""
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Afbeelding ontvangen"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Bericht te lang"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Bestand ontvangen"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr ""
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Abonneerverzoek"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 msgid "Deny"
-msgstr "Afwijzen"
+msgstr "Weigeren"
 
-#: 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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onversleuteld"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "Kan geen verbinding maken met %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr ""
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr "Uitnodiging voor %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr "%s heeft je uitgenodigd voor %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr "Machtigingsverzoek"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H:%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr "%s verzoekt toestemming om te mogen schrijven in %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ik"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Gisteren"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
-msgstr[0] "%i min geleden"
-msgstr[1] "%i min geleden"
+msgstr[0] "%i min. geleden"
+msgstr[1] "%i min. geleden"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "Zojuist"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr "Afbeelding verzonden"
-
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr "Bestand verzonden"
-
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "Afbeelding ontvangen"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eigenaar"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "Bestand ontvangen"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Beheerder"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "Abonneringsverzoek"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Lid"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr "Kon geen verbinding maken met %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Gebruiker"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr "Uitnodiging voor %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Uitnodigen"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr "uitnodiging van %s voor %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Uitnodigen voor groepsgesprek"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Privégesprek starten"
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Wegsturen"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Account %s verwijderen?"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Schrijfmachtiging verlenen"
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Verwijderen"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Schrijfmachtiging weigeren"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Kies een avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Kies een bestand"
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
-msgstr "Selecteren"
+msgstr "Kiezen"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "Annuleren"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Afbeeldingen"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Alle bestanden"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Verbinding maken…"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Verbonden"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Verbinding verbroken"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Verkeerd wachtwoord"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Ongeldig TLS-certificaat"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Fout"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Account toevoegen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Inloggen bij %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Ongeldig adress"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Verkeerde gebruikersnaam of wachtwoord"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Er ging iets mis"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Geen antwoord van server"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registreren bij %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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 website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registreren"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ik"
+msgid "%s from %s"
+msgstr "%s op %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
-msgstr ""
+msgstr "In deze conferentie mag je geen berichten versturen."
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "Request permission"
-msgstr ""
+msgstr "Toestemming vragen"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Zoeken naar berichten"
 
-#: main/src/ui/application.vala:200
-#: 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 "Deelnemen"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Deelnemers"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s in %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Gesprek starten"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Toevoegen"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Starten"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Deelnemen aan kanaal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -401,26 +229,22 @@ msgstr "Toevoegen"
 msgid "Next"
 msgstr "Volgende"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Deelnemen"
+
 #: 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 "Terug"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Gesprek beginnen"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Beginnen"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
-msgstr "Deelnemen…"
+msgstr "Bezig met deelnemen…"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:170
 msgid "Password required to enter room"
@@ -440,7 +264,7 @@ msgstr "Aanmaken van groepsgesprek niet toegestaan"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:181
 msgid "Members-only room"
-msgstr "Groepsgesprek is alleen-leden"
+msgstr "Groepsgesprek is alleen voor leden"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:184
 msgid "Choose a different nick"
@@ -450,75 +274,110 @@ msgstr "Kies een andere bijnaam"
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Beheerder"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Lid"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Gebruiker"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Uitnodigen in groepsgesprek"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Privégesprek beginnen"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Schoppen"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Ongeldig adres"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Toevoegen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
 msgid "%i search result"
 msgid_plural "%i search results"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%i zoekresultaat"
+msgstr[1] "%i zoekresultaten"
 
 #: main/src/ui/global_search.vala:167
 #, c-format
 msgid "In %s"
-msgstr "In %s"
+msgstr "Op %s"
 
 #: main/src/ui/global_search.vala:167
 #, c-format
 msgid "With %s"
 msgstr "Met %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr ""
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Aan-het-typenmeldingen versturen"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Leesbevestigingen versturen"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Meldingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Aan"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Uit"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Alleen bij vermeldingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Standaard: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Verzoek sturen"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Machtigingen"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Vraag toestemming om berichten te versturen"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
-msgstr "Groepsgespreksgegevens"
+msgstr "Groepsgesprekinformatie"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
 msgid "Contact Details"
-msgstr "Contactgegevens"
+msgstr "Contactpersooninformatie"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokkeren"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
@@ -534,36 +393,35 @@ msgstr "Blijvend"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:57
 msgid "The room will persist after the last occupant leaves"
-msgstr ""
-"Het groepsgesprek blijft bestaan wanneer de laatste deelnemer het verlaat"
+msgstr "Het groepsgesprek blijft bestaan als de laatste deelnemer het verlaat"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Publicly searchable"
-msgstr "Publiek vindbaar"
+msgstr "Openbaar"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Occupants may change the subject"
-msgstr "Deelnemers kunnen onderwerp aanpassen"
+msgstr "Deelnemers mogen het onderwerp aanpassen"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:66
 msgid "Permission to view JIDs"
-msgstr ""
+msgstr "Toestemming om JID's te bekijken"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Who is allowed to view the occupants' JIDs?"
-msgstr ""
+msgstr "Wie mag de JID's bekijken?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "A password to restrict access to the room"
-msgstr ""
+msgstr "Een wachtwoord om toegang tot het gesprek te beperken"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:74
 msgid "Moderated"
@@ -587,173 +445,276 @@ msgstr "Berichtgeschiedenis"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:83
 msgid "Maximum amount of backlog issued by the room"
-msgstr "Maximaal aantal berichten uit geschiedenis dat groepsgesprek weergeeft"
+msgstr "Het maximumaantal berichten dat het groepsgesprek toont"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:89
 msgid "Room Configuration"
-msgstr "Gespreksconfiguratie"
+msgstr "Gespreksinstellingen"
 
-#: 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 "Instellingen"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Welkom bij Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blokkeren"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Log in of maak een account om aan de slag te gaan."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Account instellen"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Geen actieve accounts"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Accounts beheren"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Wil je '%s' verwijderen?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokale instellingen"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Verwijderen"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Aan-het-typen-meldingen sturen"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Kies een profielfoto"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Leesbevestigingen sturen"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Afbeeldingen"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Meldingen"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Alle bestanden"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Aan"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Bezig met verbinden…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Uit"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Verbonden"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Enkel wanneer vermeld"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Onjuist wachtwoord"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Ongeldig TLS-certificaat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Fout"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Account toevoegen"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Standaard: %s"
+msgid "Sign in to %s"
+msgstr "Inloggen op %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Zoek berichten"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Je kunt '%s' nu gebruiken."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Leden"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Onjuiste gebruikersnaam of wachtwoord"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Er is iets misgegaan"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Geen antwoord van server"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Melding tonen bij nieuw bericht"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registreren op %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileys omzetten naar emoji’s"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "De server vereist registratie via een website"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Accounts"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Website openen"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokale alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registreren"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Geen accounts ingesteld"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Ga naar %s voor meer informatie over het registreren"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Account toevoegen"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Het bericht is te lang"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Inloggen"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "bewerkt"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Account aanmaken"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s en %i anderen zijn aan het typen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Kon geen beveiligde verbinding opstellen"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s en %s zijn aan het typen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Verbinden"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s zijn %s aan het typen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Kies een openbare server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s is aan het typen…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Of voer een serveradres in"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onversleuteld"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Met bestaand account inloggen"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Het bericht kan niet worden verstuurd"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Kies een andere server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Klaar!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Voltooien"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Sneltoetsen"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Over Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Deze contactpersoon wil je toevoegen aan zijn/haar lijst"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr "Bezig met downloaden van %s…"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr "%s biedt 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Vandaag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Verstuur een bestand"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Bericht bijwerken"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "Klik hier om een gesprek te starten of deel te nemen aan een kanaal."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+msgstr "Je hebt geen geopende gesprekken"
+
+#: 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 "Account"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Bijnaam"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Contactpersoon toevoegen"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Melding tonen bij nieuw bericht"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileys omzetten naar emoji’s"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr "Moderne XMPP-chatcliënt"
+msgstr "Een moderne XMPP-chatclient"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
@@ -761,8 +722,8 @@ msgid ""
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
-"Dino is een moderne, vrije chattoepassing voor uw bureaublad. Ze biedt een "
-"eenvoudige en betrouwbare Jabber/XMPP-ervaring, met uw privacy in het "
+"Dino is een moderne, vrije chattoepassing voor je computer. Dino biedt een "
+"eenvoudige en betrouwbare Jabber-/XMPP-ervaring, met privacy in het "
 "achterhoofd."
 
 #: main/data/im.dino.Dino.appdata.xml.in:11
@@ -771,9 +732,9 @@ msgid ""
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
-"Ze ondersteunt eind-tot-eind-versleuteling met OMEMO en OpenPGP, en staat u "
-"toe privacy-gerelateerde functies, zoals leesbevestigingen en typmeldingen, "
-"in te stellen."
+"Dino ondersteunt end-to-endversleuteling met OMEMO en OpenPGP en staat je "
+"toe privacy-gerelateerde functies, zoals leesbevestigingen en aan-het-"
+"typenmeldingen, in te stellen."
 
 #: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
@@ -783,29 +744,25 @@ msgstr ""
 "Dino haalt de geschiedenis op van de server en synchroniseert berichten met "
 "andere apparaten."
 
-#: 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 "Account"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Geen actieve zoekopdracht"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Schermnaam"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Typ om te beginnen met zoeken"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Geen overeenkomende berichten"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Contact toevoegen"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Controleer de spelling of verwijder filters"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
-msgstr ""
+msgstr "Versturen"
 
 #: main/data/shortcuts.ui:12
 msgid "General"
@@ -813,7 +770,7 @@ msgstr "Algemeen"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Gesprek"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -821,35 +778,76 @@ msgstr "Navigatie"
 
 #: main/data/shortcuts.ui:57
 msgid "Jump to next conversation"
-msgstr "Verspring naar volgend gesprek"
+msgstr "Ga naar volgend gesprek"
 
 #: main/data/shortcuts.ui:64
 msgid "Jump to previous conversation"
-msgstr "Verspring naar vorige gesprek"
+msgstr "Ga naar vorig gesprek"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Geen actieve zoekopdracht"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Accounts"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Typ om te beginnen zoeken"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Sneltoetsen"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Geen overeenkomende berichten"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Over Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Controleer de spelling of probeer filters te verwijderen"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokale alias"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Geen accounts ingesteld"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Je hebt geen open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Account toevoegen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Account aanmaken"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Kan geen beveiligde verbinding opzetten"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Verbinden"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Kies een openbare server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Of voer een serveradres in"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Inloggen op account"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Andere server kiezen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Klaar!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Voltooien"
 
 #~ msgid "No active conversations"
 #~ msgstr "Geen gesprekken actief"
@@ -857,11 +855,9 @@ msgstr "Je hebt geen open chats"
 #~ msgid "Main window with conversations"
 #~ msgstr "Hoofdvenster met gesprekken"
 
-#, 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"
 
@@ -871,11 +867,9 @@ msgstr "Je hebt geen open chats"
 #~ 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"
 
@@ -887,7 +881,6 @@ msgstr "Je hebt geen open chats"
 #~ msgid "has stopped typing"
 #~ msgstr "is gestopt met typen"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i zoekresultaten"
 
diff --git a/main/po/nl_BE.po b/main/po/nl_BE.po
index d0454339..9273fb32 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+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,381 +18,209 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.4-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Welkom bij Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Account instellen"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Geen accounts actief"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Accounts beheren"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, 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/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "Afbeelding verzonden"
 
-#: 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:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "Bestand verzonden"
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr ""
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Afbeelding ontvangen"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Bericht te lang"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Bestand ontvangen"
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr ""
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Abonneringsverzoek"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onversleuteld"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "Kon geen verbinding maken met %s"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %Hu%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %lu%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %Hu%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %lu%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ik"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %Hu%M"
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %lu%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Gisteren"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hu%M"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%lu%M %p"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr "Zojuist"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr "Afbeelding verzonden"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eigenaar"
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr "Bestand verzonden"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Beheerder"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
-msgstr "Afbeelding ontvangen"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Lid"
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
-msgstr "Bestand ontvangen"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Gebruiker"
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
-msgstr "Abonneringsverzoek"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Uitnodigen"
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
-msgstr "Kon geen verbinding maken met %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Uitnodigen in groepsgesprek"
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Privégesprek beginnen"
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
-msgstr ""
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Schoppen"
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Account %s verwijderen?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Kiest nen avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr "Selecteren"
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 "Annuleren"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Afbeeldingen"
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Alle bestanden"
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Verbinding maken…"
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Verbonden"
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Verbinding verbroken"
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Verkeerd paswoord"
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Ongeldig TLS-certificaat"
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Fout"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Account toevoegen"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Inloggen bij %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "You can now use the account %s."
+msgid "%s from %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Verkeerde gebruikersnaam of paswoord"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Geen antwoord van server"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registreren bij %s"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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 website"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registreren"
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
-#, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ik"
-
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "This conference does not allow you to send messages."
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/chat_input/chat_input_controller.vala:177
-msgid "Request permission"
-msgstr ""
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Gesprek beginnen"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Beginnen"
 
-#: main/src/ui/application.vala:200
 #: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
 msgid "Join Channel"
 msgstr "Deelnemen aan kanaal"
 
-#: main/src/ui/application.vala:200
-#: 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 "Deelnemen"
-
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr ""
-
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Toevoegen"
-
 #: 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
@@ -401,23 +229,19 @@ msgstr "Toevoegen"
 msgid "Next"
 msgstr "Volgende"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Deelnemen"
+
 #: 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 "Terug"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Gesprek beginnen"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Beginnen"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Deelnemen…"
@@ -450,46 +274,18 @@ msgstr "Kiest nen anderen bijnaam"
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Eigenaar"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Beheerder"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Lid"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Gebruiker"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Uitnodigen in groepsgesprek"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Privégesprek beginnen"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Schoppen"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Toevoegen"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -508,8 +304,63 @@ msgstr "In %s"
 msgid "With %s"
 msgstr "Met %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Aan-het-typen-meldingen sturen"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Leesbevestigingen sturen"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Meldingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Aan"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Uit"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Enkel wanneer vermeld"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Standaard: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -520,6 +371,14 @@ msgstr "Groepsgespreksgegevens"
 msgid "Contact Details"
 msgstr "Contactgegevens"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokkeren"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Naam van groepsgesprek"
@@ -555,10 +414,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Paswoord"
 
@@ -595,164 +454,267 @@ msgstr ""
 msgid "Room Configuration"
 msgstr "Gespreksconfiguratie"
 
-#: 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 "Instellingen"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Welkom bij Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blokkeren"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Account instellen"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Geen accounts actief"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Accounts beheren"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Account %s verwijderen?"
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Kiest nen avatar"
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Afbeeldingen"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Alle bestanden"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Verbinding maken…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Verbonden"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Verkeerd paswoord"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Ongeldig TLS-certificaat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Fout"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Account toevoegen"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Inloggen bij %s"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Verkeerde gebruikersnaam of paswoord"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokale instellingen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Geen antwoord van server"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Aan-het-typen-meldingen sturen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registreren bij %s"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Leesbevestigingen sturen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "De server vereist registratie via ne website"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Meldingen"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Aan"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registreren"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Uit"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Bekijkt %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Enkel wanneer vermeld"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Bericht te lang"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr ""
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
 #, c-format
-msgid "Default: %s"
-msgstr "Standaard: %s"
+msgid "%s, %s and %i others are typing…"
+msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: 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_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: 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/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Melding tonen bij nieuw bericht"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %Hu%M"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileys omzetten naar emoji’s"
+#: 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/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Accounts"
+#: 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/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokalen alias"
+#: 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/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Geen accounts ingesteld"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %Hu%M"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Account toevoegen"
+#: 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/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Inloggen"
+#: 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/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Account aanmaken"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:46
+#, c-format
+msgid "Downloading %s…"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Kon geen beveiligde verbinding opstellen"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:52
+#, c-format
+msgid "%s offered: %s"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Verbinden"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Kiest nen openbare server"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Of voert een serveradres in"
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Inloggen"
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Vandaag"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Kiest nen andere server"
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Klaar!"
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Voltooien"
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
 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 "Account"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Schermnaam"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Contact toevoegen"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Melding tonen bij nieuw bericht"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileys omzetten naar emoji’s"
+
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Modernen XMPP-chatcliënt"
@@ -785,25 +747,21 @@ msgstr ""
 "Dino haalt de geschiedenis op van de server en synchroniseert berichten met "
 "andere apparaten."
 
-#: 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 "Account"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Genen actieve zoekopdracht"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Schermnaam"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Typt voor te beginnen zoeken"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Geen overeenkomende berichten"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Contact toevoegen"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Controleert de spelling of probeert filters te verwijderen"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -829,29 +787,70 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Genen actieve zoekopdracht"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Accounts"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Typt voor te beginnen zoeken"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Geen overeenkomende berichten"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Controleert de spelling of probeert filters te verwijderen"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokalen alias"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr ""
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Geen accounts ingesteld"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr ""
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Account toevoegen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Account aanmaken"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Kon geen beveiligde verbinding opstellen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Verbinden"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Kiest nen openbare server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Of voert een serveradres in"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Inloggen"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Kiest nen andere server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Klaar!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Voltooien"
 
 #~ msgid "No active conversations"
 #~ msgstr "Geen gesprekken actief"
@@ -859,11 +858,9 @@ msgstr ""
 #~ msgid "Main window with conversations"
 #~ msgstr "Hoofdvenster met gesprekken"
 
-#, 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"
 
@@ -873,11 +870,9 @@ msgstr ""
 #~ 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"
 
@@ -889,7 +884,6 @@ msgstr ""
 #~ msgid "has stopped typing"
 #~ msgstr "is gestopt met typen"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i zoekresultaten"
 
diff --git a/main/po/oc.po b/main/po/oc.po
index e7e44cab..4fe0b14e 100644
--- a/main/po/oc.po
+++ b/main/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-06-22 10:41+0000\n"
 "Language-Team: none\n"
 "Language: oc\n"
@@ -17,176 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "La benvenguda a Dino !"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Configurar lo compte"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "I a pas cap de compte actiu"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gerir los comptes"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s e %i son a escriure"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s e %s son a escriure…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s e %s escrivon…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s escriu…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Lo messatge es tròp long"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "modificat"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Acceptar"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Pas chifrat"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Mandadís del messatge impossible"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Ara meteis"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -211,9 +41,21 @@ msgstr "Fichièr recebut"
 msgid "Subscription request"
 msgstr "Demanda d’abonament"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Acceptar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Regetar"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Connexion impossibla a %s"
@@ -237,129 +79,113 @@ msgstr "Demanda d’autorizacion"
 msgid "%s requests the permission to write in %s"
 msgstr "%s demanda l’autorizacion d’escriure dins %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Volètz suprimir lo compte %s ?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Suprimir"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Seleccionar l’avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Seleccionar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Anullar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ieu"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imatges"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Totes los fichièrs"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ièr"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Connexion…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Connectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Desconnectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "fa %i minuta"
+msgstr[1] "fa %i minutas"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Marrit senhal"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Ara meteis"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Lo certificat TLS es invalid"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Proprietari"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Error"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrador"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Ajustar un compte"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membre"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Se connectar a %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utilizaire"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Ara podètz utilizar lo compte %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Convidar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "L’adreça es invalida"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Convidar a la conferéncia"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Marrit nom d’utilizaire o senhal"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Començar una discussion privada"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Quicòm a trucat"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Expulsar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Cap de responsa del servidor"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Se marcar sus %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Lo servidor requesís una inscripcion via lo site web"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Seleccionar fichièr"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Dobrir lo site web"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seleccionar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Se marcar"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Anullar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ieu"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr "Aquesta conferéncia vos autoriza pas a enviar de messatges."
 msgid "Request permission"
 msgstr "Demanda d’autorizacion"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Cercar de messatges"
 
-#: main/src/ui/application.vala:200
-#: 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 "Rejónher"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membres"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Començar la discussion"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Ajustar"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Començar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Rejónher una sala"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "Ajustar"
 msgid "Next"
 msgstr "Seguent"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Rejónher"
+
 #: 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 "Tornar"
 
-#: 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/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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Connexion a la sala…"
@@ -449,46 +273,18 @@ msgstr "Causissètz un escais-nom diferent"
 msgid "Too many occupants in room"
 msgstr "Tròp de participants a la sala"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Proprietari"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrador"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membre"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utilizaire"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Convidar"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Convidar a la conferéncia"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Començar una discussion privada"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Expulsar"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "L’adreça es invalida"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Ajustar"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -507,9 +303,64 @@ msgstr "En %s"
 msgid "With %s"
 msgstr "Amb %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Seleccionar fichièr"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Paramètres"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Paramètres locals"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar una notificacion quand escrivètz"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Enviar un acusat de lectura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Activat"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Desactivat"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Solament quand vos mencionan"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Per defaut : %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -519,6 +370,16 @@ msgstr "Detalhs de la conferéncia"
 msgid "Contact Details"
 msgstr "Detalhs del contacte"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blocar"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"Totes los escambis de messatges e d’estat son blocats dins las doas "
+"direccions"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nom de la sala"
@@ -552,10 +413,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Senhal"
 
@@ -591,165 +452,266 @@ msgstr "Nombre maximum de messatge tornats per la sala"
 msgid "Room Configuration"
 msgstr "Configuracion de la sala"
 
-#: 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 "Paramètres"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "La benvenguda a Dino !"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blocar"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Connectatz-vos o creatz un compte per començar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
-"Totes los escambis de messatges e d’estat son blocats dins las doas "
-"direccions"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurar lo compte"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "I a pas cap de compte actiu"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gerir los comptes"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Volètz suprimir lo compte %s ?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Paramètres locals"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Suprimir"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Enviar una notificacion quand escrivètz"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Seleccionar l’avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Enviar un acusat de lectura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imatges"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificacions"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Totes los fichièrs"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Activat"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Connexion…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Desactivat"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Connectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Solament quand vos mencionan"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconnectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Marrit senhal"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Lo certificat TLS es invalid"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Error"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Ajustar un compte"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Per defaut : %s"
+msgid "Sign in to %s"
+msgstr "Se connectar a %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Cercar de messatges"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Ara podètz utilizar lo compte %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membres"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Marrit nom d’utilizaire o senhal"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Enviar un fichièr"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Quicòm a trucat"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Cap de responsa del servidor"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "M’avisar quand un nòu messatge arriba"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Se marcar sus %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertir los « smileys » en emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Lo servidor requesís una inscripcion via lo site web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Comptes"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Dobrir lo site web"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alias local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Se marcar"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Cap de compte pas configurat"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Consultatz %s per mai d’informacions tocant cossí se marchar"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Ajustar un compte"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Lo messatge es tròp long"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "S’identificar"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "modificat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Crear un compte"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s e %i son a escriure"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Establiment impossible d’una connexion segura"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s e %s son a escriure…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Connexion"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s e %s escrivon…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Causissètz un servidor public"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s escriu…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "O indicatz l’adreça d’un servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Pas chifrat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Connectatz-vos allòc"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Mandadís del messatge impossible"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Causissètz un autre servidor"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Tot es prèst !"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Terminar"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Acorchis clavièr"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "A prepaus de Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Uèi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Enviar un fichièr"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Avètz pas cap conversacion dobèrta"
+
+#: 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 "Compte"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Escais-nom"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Ajustar un contacte"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "M’avisar quand un nòu messatge arriba"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertir los « smileys » en emojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -783,25 +745,21 @@ msgstr ""
 "Dino recupèra l’istoric del servidor e sincroniza los messatges amb d’autres "
 "periferics."
 
-#: 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 "Compte"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Cap de recèrca activa"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Escais-nom"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Començatz d’escriure per aviar una recèrca"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Cap de messatge correspondent"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Ajustar un contacte"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Verificatz l’ortografia o ensajatz de suprimir de filtres"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -827,29 +785,70 @@ msgstr "Sautar la discussion seguenta"
 msgid "Jump to previous conversation"
 msgstr "Sautar a la discussion precedenta"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Cap de recèrca activa"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Comptes"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Començatz d’escriure per aviar una recèrca"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Acorchis clavièr"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Cap de messatge correspondent"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "A prepaus de Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Verificatz l’ortografia o ensajatz de suprimir de filtres"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alias local"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Cap de compte pas configurat"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Avètz pas cap conversacion dobèrta"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Ajustar un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "S’identificar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Crear un compte"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Establiment impossible d’una connexion segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Connexion"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Causissètz un servidor public"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "O indicatz l’adreça d’un servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Connectatz-vos allòc"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Causissètz un autre servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tot es prèst !"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Terminar"
 
 #~ msgid "No active conversations"
 #~ msgstr "Cap de discussion activa"
@@ -857,11 +856,9 @@ msgstr "Avètz pas cap conversacion dobèrta"
 #~ msgid "Main window with conversations"
 #~ msgstr "Fenèstra màger amb conversacions"
 
-#, 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"
 
@@ -871,11 +868,9 @@ msgstr "Avètz pas cap conversacion dobèrta"
 #~ 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"
 
@@ -887,7 +882,6 @@ msgstr "Avètz pas cap conversacion dobèrta"
 #~ msgid "has stopped typing"
 #~ msgstr "a quitat d‘escriure"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i resultats de recèrca"
 
diff --git a/main/po/pl.po b/main/po/pl.po
index 506d3737..4c85d251 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-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-06-24 11:41+0000\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/translations/"
 "pl/>\n"
@@ -19,177 +19,6 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Witaj w Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Zaloguj się lub załóż konto, aby rozpocząć."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Załóż konto"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Brak aktywnych kont"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Zarządzaj kontami"
-
-#: 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:338
-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:334
-#, 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 "oferowany %s: %s"
-
-#: main/src/ui/conversation_content_view/file_default_widget.vala:54
-#, c-format
-msgid "File offered: %s"
-msgstr "Oferowany plik: %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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s i %i innych piszą"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s i %s piszą…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s i %s piszą…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s pisze…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Za długa wiadomość"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "edytowane"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Akceptuj"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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 Cię dodać do swoich kontaktów"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Bez szyfrowania"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Nie można wysłać wiadomości"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Przed chwilą"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -214,9 +43,21 @@ msgstr "Odebrano plik"
 msgid "Subscription request"
 msgstr "Prośba o subskrypcję"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Akceptuj"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Odmów"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Nie udało się połączyć z %s"
@@ -240,129 +81,114 @@ msgstr "Prośba o dostęp"
 msgid "%s requests the permission to write in %s"
 msgstr "%s prosi o pozwolenie na pisanie na czacie z %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Usunąć konto %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Usuń"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Wybierz awatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Wybierz"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Anuluj"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ja"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Obrazy"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Wszystkie pliki"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Wczoraj"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Łączenie…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Połączony"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Rozłączony"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, 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/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Błędne hasło"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Przed chwilą"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Nieprawidłowy certyfikat TLS"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Właściciel"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Błąd"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrator"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Dodaj konto"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Członek"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Zaloguj się do %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Użytkownik"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Możesz teraz użyć konta %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Zaproś"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Niepoprawny adres"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Zaproś do konferencji"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Niepoprawna nazwa użytkownika lub hasło"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Rozpocznij prywatną rozmowę"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Coś się nie powiodło"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Wyrzuć"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Brak odpowiedzi z serwera"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Udziel pozwolenia na pisanie"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Zarejestruj się na %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Odwołaj pozwolenie na pisanie"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Serwer wymaga rejestracji przez stronę internetową"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Wybierz plik"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Otwórz stronę internetową"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Wybierz"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Zarejestruj się"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Anuluj"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ja"
+msgid "%s from %s"
+msgstr "%s z %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -372,28 +198,30 @@ msgstr "Ta konferencja nie pozwala na wysyłanie wiadomości."
 msgid "Request permission"
 msgstr "Prośba o dostęp"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Wyszukaj wiadomości"
 
-#: main/src/ui/application.vala:200
-#: 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 "Dołącz"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Członkowie"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s z %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Rozpocznij rozmowę"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Dodaj"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Rozpocznij"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Dołącz do kanału"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -403,23 +231,19 @@ msgstr "Dodaj"
 msgid "Next"
 msgstr "Dalej"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Dołącz"
+
 #: 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 "Wstecz"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Rozpocznij rozmowę"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Rozpocznij"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Dołączanie…"
@@ -452,46 +276,18 @@ msgstr "Wybierz inny nick"
 msgid "Too many occupants in room"
 msgstr "Zbyt wiele osób w pokoju"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Właściciel"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrator"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Członek"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Użytkownik"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Zaproś"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Zaproś do konferencji"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Rozpocznij prywatną rozmowę"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Wyrzuć"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Udziel pozwolenia na pisanie"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Niepoprawny adres"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Odwołaj pozwolenie na pisanie"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Dodaj"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -511,9 +307,64 @@ msgstr "W %s"
 msgid "With %s"
 msgstr "Z %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Wybierz plik"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Ustawienia lokalne"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Wyślij powiadomienie o pisaniu"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Wyślij potwierdzenia odczytu"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Powiadomienia"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Włączone"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Wyłączone"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Tylko, gdy wspomniano nick"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Domyślnie: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Prośba"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Pozwolenia"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Poproś o pozwolenie na wysyłanie wiadomości"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -523,6 +374,14 @@ msgstr "Szczegóły konferencji"
 msgid "Contact Details"
 msgstr "Szczegóły kontaktu"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Zablokuj"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Blokowanie wysyłania statusu oraz wiadomości w obu kierunkach"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nazwa pokoju"
@@ -556,10 +415,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Kto może wyświetlać identyfikatory JID użytkowników?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Hasło"
 
@@ -595,163 +454,266 @@ msgstr "Maksymalna liczba przechowywanych wiadomości"
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
-#: 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 "Ustawienia"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Witaj w Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Zablokuj"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Zaloguj się lub załóż konto, aby rozpocząć."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Blokowanie wysyłania statusu oraz wiadomości w obu kierunkach"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Załóż konto"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Prośba"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Brak aktywnych kont"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Pozwolenia"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Zarządzaj kontami"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Poproś o pozwolenie na wysyłanie wiadomości"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Usunąć konto %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Ustawienia lokalne"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Usuń"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Wyślij powiadomienie o pisaniu"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Wybierz awatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Wyślij potwierdzenia odczytu"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Obrazy"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Powiadomienia"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Wszystkie pliki"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Włączone"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Łączenie…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Wyłączone"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Połączony"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Tylko, gdy wspomniano nick"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Rozłączony"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Błędne hasło"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Nieprawidłowy certyfikat TLS"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Błąd"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Dodaj konto"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Domyślnie: %s"
+msgid "Sign in to %s"
+msgstr "Zaloguj się do %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Wyszukaj wiadomości"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Możesz teraz użyć konta %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Członkowie"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Niepoprawna nazwa użytkownika lub hasło"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Wyślij plik"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Coś się nie powiodło"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Aktualizuj wiadomość"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Brak odpowiedzi z serwera"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Powiadom, gdy nadejdzie wiadomość"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Zarejestruj się na %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Zamieniaj tekst na emotikony"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Serwer wymaga rejestracji przez stronę internetową"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Konta"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Otwórz stronę internetową"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokalny nick"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Zarejestruj się"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Brak skonfigurowanych kont"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Dowiedz się na %s, jak się zarejestrować"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Dodaj konto"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Za długa wiadomość"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Zaloguj się"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "edytowane"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Załóż konto"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s i %i innych piszą"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Nie udało się nawiązać bezpiecznego połączenia"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s i %s piszą…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Połącz"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s i %s piszą…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Wybierz serwer publiczny"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s pisze…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Lub wprowadź adres serwera"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Bez szyfrowania"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Przejdź do logowania"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Nie można wysłać wiadomości"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Wybierz inny serwer"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Wszystko gotowe!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Zakończ"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiszowe"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "O Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Ten kontakt chciałby Cię dodać do swoich kontaktów"
+
+#: 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 "oferowany %s: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:54
+#, c-format
+msgid "File offered: %s"
+msgstr "Oferowany plik: %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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Wyślij plik"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Aktualizuj wiadomość"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Nie masz otwartych czatów"
+
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Nick"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Dodaj kontakt"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Powiadom, gdy nadejdzie wiadomość"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Zamieniaj tekst na emotikony"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -784,25 +746,21 @@ msgstr ""
 "Dino pobiera historię rozmów z serwera i synchronizuje wiadomości z innymi "
 "urządzeniami."
 
-#: 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Brak aktywnego wyszukiwania"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Zacznij pisać, aby wyszukać"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Brak pasujących wiadomości"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Dodaj kontakt"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Sprawdź pisownię lub spróbuj usunąć filtry"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -828,29 +786,70 @@ msgstr "Przejdź do następnej rozmowy"
 msgid "Jump to previous conversation"
 msgstr "Przejdź do poprzedniej rozmowy"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Brak aktywnego wyszukiwania"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Konta"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Zacznij pisać, aby wyszukać"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Skróty klawiszowe"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Brak pasujących wiadomości"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "O Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Sprawdź pisownię lub spróbuj usunąć filtry"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokalny nick"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Brak skonfigurowanych kont"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Nie masz otwartych czatów"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Dodaj konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Zaloguj się"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Załóż konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Nie udało się nawiązać bezpiecznego połączenia"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Połącz"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Wybierz serwer publiczny"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Lub wprowadź adres serwera"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Przejdź do logowania"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Wybierz inny serwer"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Wszystko gotowe!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Zakończ"
 
 #~ msgid "No active conversations"
 #~ msgstr "Brak aktywnych rozmów"
@@ -858,11 +857,9 @@ msgstr "Nie masz otwartych czatów"
 #~ msgid "Main window with conversations"
 #~ msgstr "Główne okno rozmó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"
 
@@ -872,11 +869,9 @@ msgstr "Nie masz otwartych czatów"
 #~ 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"
 
@@ -889,7 +884,6 @@ msgstr "Nie masz otwartych czatów"
 #~ msgid "has stopped typing"
 #~ msgstr "przestał pisać"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i wyniki wyszukiwania"
 
diff --git a/main/po/pt.po b/main/po/pt.po
new file mode 100644
index 00000000..7d66a29e
--- /dev/null
+++ b/main/po/pt.po
@@ -0,0 +1,849 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-23 21:36+0000\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.2.1-dev\n"
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
+msgstr "Imagem enviada"
+
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
+msgstr "Ficheiro enviado"
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
+msgstr "Imagem recebida"
+
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
+msgstr "Ficheiro recebido"
+
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
+msgstr "Pedido de assinatura"
+
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Aceitar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Negar"
+
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
+msgstr "Não foi possível se conectar a %s"
+
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
+msgstr "Convite para %s"
+
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
+msgstr "%s te convidou para %s"
+
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
+msgstr "Pedido de permissão"
+
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
+msgstr "%s está pedindo permissão para escrever em %s"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: 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:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ontem"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min atrás"
+msgstr[1] "%i mins atrás"
+
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Agora há pouco"
+
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Dono"
+
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
+
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
+
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utilizador"
+
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Convidar"
+
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Convidar para Conferência"
+
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Iniciar conversa privada"
+
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kick"
+
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Conceder permissão de escrita"
+
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revogar permissão de escrita"
+
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Selecionar ficheiro"
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecionar"
+
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Cancelar"
+
+#: main/src/ui/util/helper.vala:127
+#, c-format
+msgid "%s from %s"
+msgstr "%s de %s"
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "This conference does not allow you to send messages."
+msgstr "Essa conferência não permite que envie mensagens."
+
+#: main/src/ui/chat_input/chat_input_controller.vala:177
+msgid "Request permission"
+msgstr "Pedir permissão"
+
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Buscar mensagens"
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membros"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Iniciar conversa"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Iniciar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Juntar-se a um canal"
+
+#: 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
+#: main/data/manage_accounts/add_account_dialog.ui:410
+#: main/data/manage_accounts/add_account_dialog.ui:490
+msgid "Next"
+msgstr "Próximo"
+
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Juntar-se"
+
+#: 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 "Voltar"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Joining…"
+msgstr "Juntando-se…"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:170
+msgid "Password required to enter room"
+msgstr "Palavra-passe necessária para entrar na sala"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:175
+msgid "Banned from joining or creating conference"
+msgstr "Proibido de entrar ou criar uma conferência"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:177
+msgid "Room does not exist"
+msgstr "Sala não existe"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:179
+msgid "Not allowed to create room"
+msgstr "Não permitido criar sala"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:181
+msgid "Members-only room"
+msgstr "Sala somente para membros"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:184
+msgid "Choose a different nick"
+msgstr "Escolha um apelido diferente"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:186
+msgid "Too many occupants in room"
+msgstr "Quantidade máxima da sala"
+
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Endereço inválido"
+
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Adicionar"
+
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] "%i resultado da pesquisa"
+msgstr[1] "%i resultados da pesquisa"
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
+msgstr "Em %s"
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
+msgstr "Com %s"
+
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Configurações"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Configurações locais"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar notificação ao digitar"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Enviar confirmação de leitura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificações"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Ligado"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Desligado"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Somente quando mencionado"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Predefinição: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Pedir"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permissões"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Pedir permissão para enviar mensagens"
+
+#: main/src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr "Detalhes da Conferência"
+
+#: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
+msgid "Contact Details"
+msgstr "Detalhes do contato"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquear"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Comunicação e atualizações de estado dos dois lados estão bloqueadas"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:50
+msgid "Name of the room"
+msgstr "Nome da sala"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:53
+msgid "Description of the room"
+msgstr "Descrição da sala"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:56
+msgid "Persistent"
+msgstr "Persistente"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:57
+msgid "The room will persist after the last occupant leaves"
+msgstr "A sala vai continuar depois do último integrante sair"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:60
+msgid "Publicly searchable"
+msgstr "Publicamente pesquisável"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Occupants may change the subject"
+msgstr "Integrantes podem mudar o assunto"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Permission to view JIDs"
+msgstr "Permissão de visualizar JIDs"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Who is allowed to view the occupants' JIDs?"
+msgstr "Quem consegue visualizar os JIDs dos utilizadores?"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:70
+#: main/data/add_conversation/conference_details_fragment.ui:175
+#: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
+msgid "Password"
+msgstr "Palavra-passe"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "A password to restrict access to the room"
+msgstr "Uma palavra-passe para restringir o acesso à sala"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Moderated"
+msgstr "Moderado"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Only occupants with voice may send messages"
+msgstr "Somente integrantes com voz podem enviar mensagens"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:78
+msgid "Members only"
+msgstr "Somente membros"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:79
+msgid "Only members may enter the room"
+msgstr "Somente membros podem entrar na sala"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:82
+msgid "Message history"
+msgstr "Histórico de mensagens"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:83
+msgid "Maximum amount of backlog issued by the room"
+msgstr "Quantidade máxima de histórico gerado pela sala"
+
+#: main/src/ui/contact_details/muc_config_form_provider.vala:89
+msgid "Room Configuration"
+msgstr "Configuração da sala"
+
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Seja bem vindo ao Dino!"
+
+#: main/src/ui/main_window.vala:199
+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:200
+msgid "Set up account"
+msgstr "Configurar a conta"
+
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Nenhuma conta ativa"
+
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gerir contas"
+
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Remover conta %s?"
+
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Remover"
+
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Escolher avatar"
+
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imagens"
+
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conectando…"
+
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conectado"
+
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Palavra-passe incorreta"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificado TLS inválido"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Erro"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Adicionar conta"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Registar-se em %s"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Agora pode usar a conta %s."
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Nome ou Palavra-passe errada"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Algo deu errado"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Sem resposta do servidor"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registe-se em %s"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+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 website"
+msgstr "Abrir website"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registar"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Verifique %s para informação de como se inscrever"
+
+#: 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:185
+msgid "edited"
+msgstr "editado"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s e %i outros estão digitando…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s e %s estão digitando…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s e %s estão digitando…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s está digitando…"
+
+#: 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 "Não foi possível enviar a mensagem"
+
+#: 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/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/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 "Ficheiro oferecido: %s"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:56
+msgid "File offered"
+msgstr "Ficheiro oferecido"
+
+#: main/src/ui/conversation_content_view/file_default_widget.vala:62
+msgid "File transfer failed"
+msgstr "Transferência de ficheiro falhou"
+
+#: 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:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Enviar um ficheiro"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Atualizar mensagem"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "Clique aqui para iniciar uma conversa or entrar num canal."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+msgstr "Não tem conversas abertas"
+
+#: 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 "Conta"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Apelido"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Pseudônimo"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Adicionar contato"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar quando uma nova mensagem chegar"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converter smileys para emojis"
+
+#: main/data/im.dino.Dino.appdata.xml.in:8
+msgid "Modern XMPP Chat Client"
+msgstr "Moderno cliente de chat XMPP"
+
+#: main/data/im.dino.Dino.appdata.xml.in:10
+msgid ""
+"Dino is a modern open-source chat client for the desktop. It focuses on "
+"providing a clean and reliable Jabber/XMPP experience while having your "
+"privacy in mind."
+msgstr ""
+"Dino é um moderno chat de código aberto para desktop. Ele é focado em prover "
+"uma transparente e confiável experiência Jabber/XMPP, tendo em mente a sua "
+"privacidade."
+
+#: main/data/im.dino.Dino.appdata.xml.in:11
+msgid ""
+"It supports end-to-end encryption with OMEMO and OpenPGP and allows "
+"configuring privacy-related features such as read receipts and typing "
+"notifications."
+msgstr ""
+"Suporte criptografia ponta a ponta com OMEMO e OpenPGP e permite configurar "
+"privacidade—características relacionadas às notificações de leitura, "
+"recebimento e escrita."
+
+#: main/data/im.dino.Dino.appdata.xml.in:12
+msgid ""
+"Dino fetches history from the server and synchronizes messages with other "
+"devices."
+msgstr ""
+"Dino obtém o histórico do servidor e sincroniza mensagens com outros "
+"aparelhos."
+
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Sem busca ativa"
+
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Escreva para iniciar a busca"
+
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Sem mensagens correspondentes"
+
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Verifique a grafia ou tente remover filtros"
+
+#: main/data/file_send_overlay.ui:80
+msgid "Send"
+msgstr "Enviar"
+
+#: main/data/shortcuts.ui:12
+msgid "General"
+msgstr "Geral"
+
+#: main/data/shortcuts.ui:32
+msgid "Conversation"
+msgstr "Conversa"
+
+#: main/data/shortcuts.ui:52
+msgid "Navigation"
+msgstr "Navegação"
+
+#: main/data/shortcuts.ui:57
+msgid "Jump to next conversation"
+msgstr "Ir para a próxima conversa"
+
+#: main/data/shortcuts.ui:64
+msgid "Jump to previous conversation"
+msgstr "Ir para a conversa anterior"
+
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Contas"
+
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Atalhos de Teclado"
+
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Sobre Dino"
+
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Pseudônimo local"
+
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nenhuma conta configurada"
+
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Adicionar conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Registar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Criar conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Não foi possível estabelecer uma conexão segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Conectar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Escolha um servidor publico"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Ou especifique um endereço de servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Entrar em vez disso"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Escolha outro servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tudo configurado!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Finalizado"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 506a352f..c7cbc712 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-23 00:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-19 12:32+0000\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/dino/"
 "translations/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -15,177 +15,7 @@ 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 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Seja bem vindo ao Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Configurar a conta"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Nenhuma conta ativa"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Gerenciar contas"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s e %i outros estão digitando"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s e %s estão digitando…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s e %s estão digitando…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s está digitando…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mensagem muito longa"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editado"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Aceitar"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Não-criptografado"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Não foi possível enviar a mensagem"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Agora há pouco"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -211,9 +41,21 @@ msgstr "Arquivo recebido"
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Aceitar"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Negar"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Não foi possível se conectar a %s"
@@ -237,129 +79,113 @@ msgstr "Pedido de permissão"
 msgid "%s requests the permission to write in %s"
 msgstr "%s está pedindo permissão para escrever em %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Remover conta %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Remover"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Escolher avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Selecionar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Cancelar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Eu"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imagens"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Todos os arquivos"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ontem"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Conectando…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Conectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Desconectado"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, 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/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Senha incorreta"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Agora há pouco"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificado TLS inválido"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Dono"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Erro"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Adicionar conta"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Registrar-se em %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usuário"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Você agora pode usar a conta %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Convidar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Endereço inválido"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Convidar para Conferência"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Nome ou Senha errada"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Iniciar conversa privada"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Algo deu errado"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kick"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Sem resposta do servidor"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Conceder permissão de escrita"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registre-se em %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revogar permissão de escrita"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-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/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Selecionar arquivo"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Abrir website"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecionar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrar"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Cancelar"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Eu"
+msgid "%s from %s"
+msgstr "%s de %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr "Essa conferência não permite que você envie mensagens."
 msgid "Request permission"
 msgstr "Pedir permissão"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Buscar mensagens"
 
-#: main/src/ui/application.vala:200
-#: 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 "Juntar-se"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membros"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Iniciar conversa"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Adicionar"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Iniciar"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Juntar-se a um canal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "Adicionar"
 msgid "Next"
 msgstr "Próximo"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Juntar-se"
+
 #: 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 "Voltar"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Iniciar conversa"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Iniciar"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Juntando-se…"
@@ -449,46 +273,18 @@ msgstr "Escolha um apelido diferente"
 msgid "Too many occupants in room"
 msgstr "Número máximo da sala"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Dono"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Admin"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membro"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Usuário"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Convidar"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Convidar para Conferência"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Iniciar conversa privada"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kick"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Conceder permissão de escrita"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Endereço inválido"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revogar permissão de escrita"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Adicionar"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -507,9 +303,64 @@ msgstr "Em %s"
 msgid "With %s"
 msgstr "Com %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Selecionar arquivo"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Configurações"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Configurações locais"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar notificação ao digitar"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Enviar confirmação de leitura"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificações"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Ligado"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Desligado"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Somente quando mencionado"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Padrão: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Pedir"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permissões"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Pedir permissão para enviar mensagens"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -519,6 +370,14 @@ msgstr "Detalhes da Conferência"
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquear"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Comunicação e atualizações de status dos dois lados estão bloqueadas"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Nome da sala"
@@ -552,10 +411,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Quem consegue visualizar os JIDs dos usuários?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Senha"
 
@@ -591,163 +450,266 @@ msgstr "Quantidade máxima de histórico gerado pela sala"
 msgid "Room Configuration"
 msgstr "Configuração da sala"
 
-#: 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 "Configurações"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Seja bem vindo ao Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Bloquear"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Entre ou crie uma conta para começar."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Comunicação e atualizações de status dos dois lados estão bloqueadas"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurar a conta"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Pedir"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Nenhuma conta ativa"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permissões"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Gerenciar contas"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Pedir permissão para enviar mensagens"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Remover conta %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Configurações locais"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Remover"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Enviar notificação ao digitar"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Escolher avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Enviar confirmação de leitura"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imagens"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificações"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Todos os arquivos"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Ligado"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conectando…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Desligado"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Somente quando mencionado"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
-#, c-format
-msgid "Default: %s"
-msgstr "Padrão: %s"
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Senha incorreta"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Buscar mensagens"
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificado TLS inválido"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membros"
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Erro"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Enviar um arquivo"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Adicionar conta"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Atualizar mensagem"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
+#, c-format
+msgid "Sign in to %s"
+msgstr "Registrar-se em %s"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notificar quando uma nova mensagem chegar"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Você agora pode usar a conta %s."
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converter smileys para emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Nome ou Senha errada"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Contas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Algo deu errado"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Pseudônimo local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Sem resposta do servidor"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Nenhuma conta configurada"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registre-se em %s"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Adicionar conta"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "O servidor requer que se inscreva através de um site"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Abrir website"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr "Registrar"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Criar conta"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Verifique %s para informação de como se inscrever"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Não foi possível estabelecer uma conexão segura"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mensagem muito longa"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Conectar"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editado"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Escolha um servidor publico"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s e %i outros estão digitando…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Ou especifique um endereço de servidor"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s e %s estão digitando…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Entrar em vez disso"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s e %s estão digitando…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Escolha outro servidor"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s está digitando…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Tudo configurado!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Não-criptografado"
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Finalizado"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Não foi possível enviar a mensagem"
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Atalhos de Teclado"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Sobre Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Hoje"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Enviar um arquivo"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Atualizar mensagem"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Você não tem conversas abertas"
+
+#: 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 "Conta"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Apelido"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Pseudônimo"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Adicionar contato"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar quando uma nova mensagem chegar"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converter smileys para emojis"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -781,25 +743,21 @@ msgstr ""
 "Dino obtém o histórico do servidor e sincroniza mensagens com outros "
 "dispositivos."
 
-#: 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 "Conta"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Sem busca ativa"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Apelido"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Escreva para iniciar a busca"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Pseudônimo"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Sem mensagens correspondentes"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Adicionar contato"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Verifique a grafia ou tente remover filtros"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -811,7 +769,7 @@ msgstr "Geral"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Conversa"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -825,29 +783,70 @@ msgstr "Ir para a próxima conversa"
 msgid "Jump to previous conversation"
 msgstr "Ir para a conversa anterior"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Sem busca ativa"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Contas"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Escreva para iniciar a busca"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Atalhos de Teclado"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Sem mensagens correspondentes"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Sobre Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Verifique a grafia ou tente remover filtros"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Pseudônimo local"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nenhuma conta configurada"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Você não tem conversas abertas"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Adicionar conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Registrar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Criar conta"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Não foi possível estabelecer uma conexão segura"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Conectar"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Escolha um servidor publico"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Ou especifique um endereço de servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Entrar em vez disso"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Escolha outro servidor"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Tudo configurado!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Finalizado"
 
 #~ msgid "No active conversations"
 #~ msgstr "Nenhuma conversa ativa"
@@ -855,11 +854,9 @@ msgstr "Você não tem conversas abertas"
 #~ msgid "Main window with conversations"
 #~ msgstr "Janela principal com as conversas"
 
-#, 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"
 
@@ -869,11 +866,9 @@ msgstr "Você não tem conversas abertas"
 #~ 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"
 
@@ -885,7 +880,6 @@ msgstr "Você não tem conversas abertas"
 #~ msgid "has stopped typing"
 #~ msgstr "parou de digitar"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i resultado(s) da busca"
 
diff --git a/main/po/ro.po b/main/po/ro.po
index 9964b85c..5a94c098 100644
--- a/main/po/ro.po
+++ b/main/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-19 21:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-04 14:32+0000\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/"
 "translations/ro/>\n"
 "Language: ro\n"
@@ -17,178 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Bine ați venit la Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Configurare cont"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Nici un cont activ"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Administrare conturi"
-
-#: 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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s și încă %i tastează"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s și %s tastează…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s și %s tastează…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s tastează…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mesaj prea lung"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "editat"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Acceptă"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Necriptat"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Nu se poate transmite mesajul"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Chiar acum"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -214,9 +43,21 @@ msgstr "Fișier primit"
 msgid "Subscription request"
 msgstr "Cerere de abonare"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Acceptă"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Refuză"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Nu s-a putut face conectarea la %s"
@@ -240,129 +81,114 @@ msgstr "Solicitare de permisiune"
 msgid "%s requests the permission to write in %s"
 msgstr "%s solicită permisiunea de a scrie în %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Se șterge contul %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Șterge"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Selectare avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Selectare"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Anulare"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Eu"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Imagini"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Toate fișierele"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Ieri"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Conectare…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Conectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Deconectat"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, 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/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Parolă greșită"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Chiar acum"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Certificat TLS invalid"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Proprietar"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Eroare"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrator"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Adaugă un cont"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membru/ă"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Autentificare în %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utilizator"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Acum puteți începe să utilizați contul %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Invită"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Adresă invalidă"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Invită la o conferință"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Nume utilizator sau parolă greșite"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Pornește o conversație privată"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "A apărut o problemă"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Dă afară"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Nici un răspuns de la server"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Acordă permisiunea de a scrie"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Înregistrare pe %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Revoca permisiunea de a scrie"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Serverul necesită înregistrarea printr-un site web"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Selectare fișier"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Deschide site-ul"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selectare"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Înregistrează-te"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Anulare"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Eu"
+msgid "%s from %s"
+msgstr "%s de la %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -372,28 +198,30 @@ msgstr "Această conferință nu vă permite să trimiteți mesaje."
 msgid "Request permission"
 msgstr "Solicitare permisiune"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Caută mesaje"
 
-#: main/src/ui/application.vala:200
-#: 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 "Alăturați-vă"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Membri"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s de la %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Pornește o conversație"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Adaugă"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Pornire"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Alăturați-vă canalului"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -403,23 +231,19 @@ msgstr "Adaugă"
 msgid "Next"
 msgstr "Următorul"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Alăturați-vă"
+
 #: 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 "Înapoi"
 
-#: 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/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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Conectare…"
@@ -452,46 +276,18 @@ msgstr "Alegeți un nume diferit"
 msgid "Too many occupants in room"
 msgstr "Discuția are prea mulți membrii"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Proprietar"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Administrator"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Membru/ă"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Utilizator"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Invită"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Invită la o conferință"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Pornește o conversație privată"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Dă afară"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Acordă permisiunea de a scrie"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Adresă invalidă"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Revoca permisiunea de a scrie"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Adaugă"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -511,9 +307,64 @@ msgstr "În %s"
 msgid "With %s"
 msgstr "Cu %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Selectare fișier"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Setări"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Setări locale"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Trimite notificare la tastare"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Trimite notificare la primire"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Notificări"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Da"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Nu"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Doar la mențiuni"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Implicit: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Cerere"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Permisiuni"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Solicita permisiunea de a trimite mesaje"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -523,6 +374,14 @@ msgstr "Detalii conferință"
 msgid "Contact Details"
 msgstr "Detalii contact"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blochează"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Comunicațiile și actualizările de stare sunt blocate în ambele sensuri"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Numele discuției"
@@ -556,10 +415,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Cine are voie să vadă JID-urile ocupanților?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Parolă"
 
@@ -595,163 +454,266 @@ msgstr "Numărul maxim de mesaje din istoric ce va fi afișat în discuție"
 msgid "Room Configuration"
 msgstr "Configurare discuție"
 
-#: 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 "Setări"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Bine ați venit la Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blochează"
+#: main/src/ui/main_window.vala:199
+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/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Comunicațiile și actualizările de stare sunt blocate în ambele sensuri"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Configurare cont"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Cerere"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Nici un cont activ"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Permisiuni"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Administrare conturi"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Solicita permisiunea de a trimite mesaje"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Se șterge contul %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Setări locale"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Șterge"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Trimite notificare la tastare"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Selectare avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Trimite notificare la primire"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Imagini"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Notificări"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Toate fișierele"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Da"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Conectare…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Nu"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Conectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Doar la mențiuni"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Deconectat"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Parolă greșită"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Certificat TLS invalid"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Eroare"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Adaugă un cont"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Implicit: %s"
+msgid "Sign in to %s"
+msgstr "Autentificare în %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Caută mesaje"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Acum puteți începe să utilizați contul %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Membri"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Nume utilizator sau parolă greșite"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Trimite fișier"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "A apărut o problemă"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Actualizare mesaj"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Nici un răspuns de la server"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifică atunci când este primit un mesaj nou"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Înregistrare pe %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertește zâmbilici în emoticoane"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Serverul necesită înregistrarea printr-un site web"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Conturi"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Deschide site-ul"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Alias local"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Înregistrează-te"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Nici un cont configurat"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Aflați pe %s informații despre cum se face înregistrarea"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Adaugă un cont"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mesaj prea lung"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Autentificare"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "editat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Creează cont"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s și încă %i tastează…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Nu s-a putut stabili o conexiune securizată"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s și %s tastează…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Conectare"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s și %s tastează…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Alegeți un server public"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s tastează…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Sau specificați adresa serverului"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Necriptat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Înapoi la conectare"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Nu se poate transmite mesajul"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Alege alt server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Gata!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Finalizare"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Scurtături de tastatură"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Despre Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Azi"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Trimite fișier"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Actualizare mesaj"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Nu aveți nici o discuție deschisă"
+
+#: 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 "Cont"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Nume"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Adaugă contact"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifică atunci când este primit un mesaj nou"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertește zâmbilici în emoticoane"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -785,25 +747,21 @@ msgstr ""
 "Dino preia istoricul discuțiilor de pe server și sincronizează mesajele cu "
 "celelalte dispozitive."
 
-#: 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 "Cont"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Nici o căutare activă"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Nume"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Tastați ceva pentru a porni căutarea"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Nici un mesaj nu se potrivește"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Adaugă contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Verificați ortografia sau încercați să eliminați filtre"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -815,7 +773,7 @@ msgstr "General"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Discuție"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -829,29 +787,70 @@ msgstr "Salt la următoarea conversație"
 msgid "Jump to previous conversation"
 msgstr "Salt la conversația anterioară"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Nici o căutare activă"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Conturi"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Tastați ceva pentru a porni căutarea"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Scurtături de tastatură"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Nici un mesaj nu se potrivește"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Despre Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Verificați ortografia sau încercați să eliminați filtre"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Alias local"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Nici un cont configurat"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Nu aveți nici o discuție deschisă"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Adaugă un cont"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Autentificare"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Creează cont"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Nu s-a putut stabili o conexiune securizată"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Conectare"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Alegeți un server public"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Sau specificați adresa serverului"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Înapoi la conectare"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Alege alt server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Gata!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Finalizare"
 
 #~ msgid "No active conversations"
 #~ msgstr "Nici o conversație activă"
@@ -859,11 +858,9 @@ msgstr "Nu aveți nici o discuție deschisă"
 #~ msgid "Main window with conversations"
 #~ msgstr "Fereastra principală de conversații"
 
-#, 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"
 
@@ -873,11 +870,9 @@ msgstr "Nu aveți nici o discuție deschisă"
 #~ 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"
 
@@ -890,7 +885,6 @@ msgstr "Nu aveți nici o discuție deschisă"
 #~ msgid "has stopped typing"
 #~ msgstr "s-a oprit din scris"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i rezultate la căutare"
 
diff --git a/main/po/ru.po b/main/po/ru.po
index c908fd3a..e9646569 100644
--- a/main/po/ru.po
+++ b/main/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-06-02 11:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-10 12:32+0000\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/"
 "translations/ru/>\n"
 "Language: ru\n"
@@ -17,178 +17,7 @@ msgstr ""
 "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"
-"X-Generator: Weblate 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Добро пожаловать в Dino!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Войдите или создайте учётную запись, чтобы начать использование."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Настроить учётную запись"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Нет активных учётных записей"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-msgid "Yesterday"
-msgstr "Вчера"
-
-#: 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:334
-#, 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 "Скачивание %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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s и ещё %i печатают"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s и %s печатают…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s и %s печатают…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s печатает…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Сообщение слишком длинное"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "ред."
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Принять"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Не зашифровано"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Не удаётся отправить сообщение"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%H∶%M, %x"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%l∶%M, %x %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Только что"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -214,9 +43,21 @@ msgstr "Файл получен"
 msgid "Subscription request"
 msgstr "Требуется авторизация"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Принять"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Отклонить"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Не удаётся подключиться к %s"
@@ -240,129 +81,114 @@ msgstr "Запрос на разрешения"
 msgid "%s requests the permission to write in %s"
 msgstr "%s запросил(а) разрешение на возможность писать в %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Удалить аккаунт %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Удалить"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Выбрать аватарку"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Выбрать"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Отмена"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Я"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Изображения"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Все файлы"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Вчера"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Подключение…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Подключено"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Отключено"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i минута назад"
+msgstr[1] "%i минуты назад"
+msgstr[2] "%i минут назад"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Неверный пароль"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Только что"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Недействительный TSL сертификат"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Владелец"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Ошибка"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Администратор"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Добавить аккаунт"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Участник"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Вход в уч. запись %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Пользователь"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Теперь вы можете использовать учётную запись %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Пригласить"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Недействительный адрес"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Пригласить в чат"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Неправильный логин или пароль"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Начать личный чат"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Что-то пошло не так"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Выгнать"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Нет ответа от сервера"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Выдать разрешение писать"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Регистрация в %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Отобрать разрешение писать"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Сервер требует авторизацию через сайт"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Выберите файл"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Открыть веб-сайт"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Выбрать"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Зарегистрироваться"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Отмена"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "Прочтите %s, чтобы узнать о процессе авторизации"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Я"
+msgid "%s from %s"
+msgstr "%s из %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -372,28 +198,30 @@ msgstr "Вам запретили отправлять сообщения в э�
 msgid "Request permission"
 msgstr "Запросить разрешение"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Поиск сообщений"
 
-#: main/src/ui/application.vala:200
-#: 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 "Войти"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Участники"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s из %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Начать чат"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Добавить"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Начать"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Войти в канал"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -403,23 +231,19 @@ msgstr "Добавить"
 msgid "Next"
 msgstr "Далее"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Начать чат"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Начать"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Присоединение…"
@@ -452,46 +276,18 @@ msgstr "Выберите другой никнейм"
 msgid "Too many occupants in room"
 msgstr "В комнате слишком много посетителей"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Владелец"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Администратор"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Участник"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Пользователь"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Пригласить"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Пригласить в чат"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Начать личный чат"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Выгнать"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Выдать разрешение писать"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Недействительный адрес"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Отобрать разрешение писать"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Добавить"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -511,9 +307,64 @@ msgstr "В %s"
 msgid "With %s"
 msgstr "С %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Выберите файл"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Настройки"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Локальные настройки"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Отправлять уведомления при наборе сообщения"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Отправлять уведомления о прочтении"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Уведомления"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "ВКЛ"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "ВЫКЛ"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Только при упоминании"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "По умолчанию: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "Запросить"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "Разрешения"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Запросить разрешение на отправку сообщений"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -523,6 +374,14 @@ msgstr "Информация о конференции"
 msgid "Contact Details"
 msgstr "Информация о контакте"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Заблокировать"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Переписка и обновления статусов заблокированы в оба направления"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Название комнаты"
@@ -556,10 +415,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Кому разрешено просматривать JID посетителей?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Пароль"
 
@@ -595,163 +454,266 @@ msgstr "Максимальное количество логов, оставля
 msgid "Room Configuration"
 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 "Настройки"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Добро пожаловать в Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Заблокировать"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Войдите или создайте учётную запись, чтобы начать использование."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Переписка и обновления статусов заблокированы в оба направления"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Настроить учётную запись"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "Запросить"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Нет активных учётных записей"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "Разрешения"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Управление учётными записями"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Запросить разрешение на отправку сообщений"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Удалить аккаунт %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Локальные настройки"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Удалить"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Отправлять уведомления при наборе сообщения"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Выбрать аватарку"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Отправлять уведомления о прочтении"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Изображения"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Уведомления"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Все файлы"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "ВКЛ"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Подключение…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "ВЫКЛ"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Подключено"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Только при упоминании"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Отключено"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Неверный пароль"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Недействительный TSL сертификат"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Ошибка"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Добавить аккаунт"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "По умолчанию: %s"
+msgid "Sign in to %s"
+msgstr "Вход в уч. запись %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Поиск сообщений"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Теперь вы можете использовать учётную запись %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Участники"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Неправильный логин или пароль"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Прикрепить файл"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Что-то пошло не так"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Редактировать сообщение"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Нет ответа от сервера"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Уведомлять о новых сообщениях"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Регистрация в %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Превращать смайлы в эмодзи"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Сервер требует пройти авторизацию через сайт"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Учётные записи"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Открыть веб-сайт"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Псевдоним"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Зарегистрироваться"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Нет настроенных уч. записей"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Прочтите %s, чтобы узнать о процессе авторизации"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Добавить аккаунт"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Сообщение слишком длинное"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Войти"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "ред."
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Создать аккаунт"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s и ещё %i печатают…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Не удалось установить защищённое соединение"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s и %s печатают…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Присоединиться"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s и %s печатают…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Выберите публичный сервер"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s печатает…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Или введите адрес сервера сами"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Не зашифровано"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Войти"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Не удаётся отправить сообщение"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Выбрать другой сервер"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%H∶%M, %x"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Всё готово!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%l∶%M, %x %p"
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Закончить"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Горячие клавиши"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "О Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Этот контакт хочет добавить вас в свой список контактов"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Сегодня"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Прикрепить файл"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Редактировать сообщение"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "Нажмите здесь, чтобы начать беседу или присоединиться к каналу."
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 "Уч. запись"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Никнейм"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Псевдоним"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Добавить контакт"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Уведомлять о новых сообщениях"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Превращать смайлы в эмодзи"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -784,25 +746,21 @@ msgstr ""
 "Dino загружает историю с сервера и синхронизирует сообщения с другими "
 "устройствами."
 
-#: 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 "Уч. запись"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Поиск по сообщениям"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Никнейм"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Начните писать то, что хотите найти"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Псевдоним"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Нет подходящих сообщений"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Добавить контакт"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Проверьте словари или измените критерии поиска"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -814,7 +772,7 @@ msgstr "Основное"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Беседа"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -828,29 +786,70 @@ msgstr "Перейти к следующему чату"
 msgid "Jump to previous conversation"
 msgstr "Перейти к предыдущему чату"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Поиск по сообщениям"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Учётные записи"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Начните писать то, что хотите найти"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Горячие клавиши"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Нет подходящих сообщений"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "О Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Проверьте словари или измените критерии поиска"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Псевдоним"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "Нажмите здесь, чтобы начать беседу или присоединиться к каналу."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Нет настроенных уч. записей"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Тут пустовато"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Добавить аккаунт"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Войти"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Создать аккаунт"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Не удалось установить защищённое соединение"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Присоединиться"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Выберите публичный сервер"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Или введите адрес сервера сами"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Войти"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Выбрать другой сервер"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Всё готово!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Закончить"
 
 #~ msgid "No active conversations"
 #~ msgstr "Нет активных чатов"
@@ -858,11 +857,9 @@ msgstr "Тут пустовато"
 #~ msgid "Main window with conversations"
 #~ msgstr "Главное окно с чатами"
 
-#, c-format
 #~ msgid "%s, %s and %i others"
 #~ msgstr "%s, %s и ещё %i человек"
 
-#, c-format
 #~ msgid "You can now start using %s"
 #~ msgstr "Теперь вы можете использовать %s"
 
@@ -872,11 +869,9 @@ msgstr "Тут пустовато"
 #~ msgid "Save"
 #~ msgstr "Сохранить"
 
-#, c-format
 #~ msgid "%s, %s and %s"
 #~ msgstr "%s, %s и %s"
 
-#, c-format
 #~ msgid "%s and %s"
 #~ msgstr "%s и %s"
 
@@ -889,7 +884,6 @@ msgstr "Тут пустовато"
 #~ msgid "has stopped typing"
 #~ msgstr "перестал печатать"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "Результаты поиска по запросу «%i»"
 
diff --git a/main/po/sv.po b/main/po/sv.po
index 34e66e5a..ad7b408d 100644
--- a/main/po/sv.po
+++ b/main/po/sv.po
@@ -7,185 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-21 12:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-19 12:32+0000\n"
 "Language-Team: none\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Välkommen till Dino!"
-
-#: main/src/ui/main_window.vala:199
-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:200
-msgid "Set up account"
-msgstr "Ställ in konto"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Inga aktiva konton"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Hantera konton"
-
-#: main/src/ui/conversation_content_view/date_separator_populator.vala:83
-msgid "Today"
-msgstr "Idag"
-
-#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
-msgid "Yesterday"
-msgstr "Igå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:334
-#, 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 "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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s och %i skriver"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s och %s skriver…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s och %s skriver…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s skriver…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Meddelandet är för långt"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "redigerad"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Godkänn"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Okrypterat"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Kunde inte skicka meddelandet"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H : %M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Just nu"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -211,9 +41,21 @@ msgstr "Fil mottagen"
 msgid "Subscription request"
 msgstr "Prenumerationsförfrågan"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Godkänn"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Neka"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Kunde inte ansluta till %s"
@@ -237,129 +79,113 @@ msgstr "Åtkomstbegäran"
 msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Ta bort konto %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Ta bort"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Välj avatar"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Välj"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Avbryt"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Jag"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Bilder"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Alla filer"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Igår"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Ansluter…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H : %M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Ansluten"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Frånkopplad"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minut sedan"
+msgstr[1] "%i minuter sedan"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Fel lösenord"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Just nu"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Ogiltigt TLS-certifikat"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Ägare"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Fel"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Lägg till konto"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Medlem"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Logga in på %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Användare"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Du kan nu börja använda kontot %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Bjud in"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Ogiltig adress"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Bjud in till gruppchatt"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Fel användarnamn eller lösenord"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Starta privat konversation"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Något gick fel"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kasta ut"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Inget svar från servern"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Registrera konto på %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Servern kräver registrering genom en webbsida"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Välj fil"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Öppna webbsida"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Välj"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Registrera"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Avbryt"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Jag"
+msgid "%s from %s"
+msgstr "%s från %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Sök meddelanden"
 
-#: main/src/ui/application.vala:200
-#: 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 "Anslut"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Medlemmar"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s från %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Starta Chatt"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Lägg till"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Starta"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Anslut till kanal"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "Lägg till"
 msgid "Next"
 msgstr "Nästa"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Anslut"
+
 #: 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 "Tillbaka"
 
-#: 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/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Starta Chatt"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Starta"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Ansluter…"
@@ -449,46 +273,18 @@ msgstr "Välj ett annat smeknamn"
 msgid "Too many occupants in room"
 msgstr "För många användare i rummet"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Ägare"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Admin"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Medlem"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Användare"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Bjud in"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Bjud in till gruppchatt"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Starta privat konversation"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kasta ut"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr ""
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Ogiltig adress"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr ""
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Lägg till"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -507,8 +303,63 @@ msgstr "I %s"
 msgid "With %s"
 msgstr "Med %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Inställningar"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokala inställningar"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Skicka skriftaviseringar"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "Skicka läsbekräftelser"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Aviseringar"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "På"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Av"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Vid omnämnande"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Standard: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -519,6 +370,14 @@ msgstr "Konferensdetaljer"
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blockera"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Kommunikation och statusuppdatering i båda riktningar blockeras"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Namn på rummet"
@@ -553,10 +412,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Vem har tillstånd att se användarnas JID?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Lösenord"
 
@@ -592,163 +451,266 @@ msgstr "Maxgräns på meddelandehistoriken i rummet"
 msgid "Room Configuration"
 msgstr "Rumskonfiguration"
 
-#: 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 "Inställningar"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Välkommen till Dino!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Blockera"
+#: main/src/ui/main_window.vala:199
+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/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "Kommunikation och statusuppdatering i båda riktningar blockeras"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Ställ in konto"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Inga aktiva konton"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Hantera konton"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Ta bort konto %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Lokala inställningar"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Ta bort"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "Skicka skriftaviseringar"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Välj avatar"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "Skicka läsbekräftelser"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Bilder"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Aviseringar"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Alla filer"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "På"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Ansluter…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Av"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Ansluten"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Vid omnämnande"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Frånkopplad"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Fel lösenord"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Ogiltigt TLS-certifikat"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Fel"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Lägg till konto"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Standard: %s"
+msgid "Sign in to %s"
+msgstr "Logga in på %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Sök meddelanden"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Du kan nu börja använda kontot %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Medlemmar"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Fel användarnamn eller lösenord"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Något gick fel"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Uppdatera meddelande"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Inget svar från servern"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Avisera när ett nytt meddelande mottages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Registrera konto på %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Konvertera smileys till emojin"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Servern kräver registrering genom en webbsida"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Konton"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Öppna webbsida"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Lokalt alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Registrera"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Inga konfigurerade konton"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Kolla %s för information om registrering"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Lägg till konto"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Meddelandet är för långt"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Logga in"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "redigerad"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Skapa konto"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s och %i andra skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Kunde inte etablera en säker anslutning"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s och %s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Anslut"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s och %s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Välj en offentlig server"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s skriver…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Eller ange en serveraddress"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Okrypterat"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Logga in i stället"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Kunde inte skicka meddelandet"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Välj en annan server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Färdigt!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Slutför"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Snabbkommandon"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Om Dino"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Idag"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Skicka en fil"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Uppdatera meddelande"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Du har inga öppna konversationer"
+
+#: 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 "Konto"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Smeknamn"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Alias"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Lägg till kontakt"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Avisera när ett nytt meddelande mottages"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Konvertera smileys till emojin"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -782,29 +744,25 @@ msgstr ""
 "Dino hämtar historik från servern och synkroniserar meddelanden med andra "
 "enheter."
 
-#: 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 "Konto"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Ingen aktiv sökning"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Smeknamn"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Skriv för att börja söka"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Inga meddelande matchade"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Lägg till kontakt"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Kolla stavningen eller ta bort filter"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
-msgstr ""
+msgstr "Skicka"
 
 #: main/data/shortcuts.ui:12
 msgid "General"
@@ -812,7 +770,7 @@ msgstr "Allmänt"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Konversation"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -826,29 +784,70 @@ msgstr "Hoppa till nästa konversation"
 msgid "Jump to previous conversation"
 msgstr "Hoppa till föregående konversation"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Ingen aktiv sökning"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Konton"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Skriv för att börja söka"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Snabbkommandon"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Inga meddelande matchade"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Om Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Kolla stavningen eller ta bort filter"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Lokalt alias"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Inga konfigurerade konton"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Du har inga öppna konversationer"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Lägg till konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Logga in"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Skapa konto"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Kunde inte etablera en säker anslutning"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Anslut"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Välj en offentlig server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Eller ange en serveraddress"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Logga in i stället"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Välj en annan server"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Färdigt!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Slutför"
 
 #~ msgid "No active conversations"
 #~ msgstr "Inga aktiva chattar"
@@ -856,11 +855,9 @@ msgstr "Du har inga öppna konversationer"
 #~ msgid "Main window with conversations"
 #~ msgstr "Huvudfönster med 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"
 
@@ -870,11 +867,9 @@ msgstr "Du har inga öppna konversationer"
 #~ 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"
 
@@ -886,7 +881,6 @@ msgstr "Du har inga öppna konversationer"
 #~ msgid "has stopped typing"
 #~ msgstr "har slutat skriva"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i sökresultat"
 
diff --git a/main/po/ta.po b/main/po/ta.po
index f86a729e..0b430c20 100644
--- a/main/po/ta.po
+++ b/main/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-04-16 20:11+0000\n"
 "Language-Team: none\n"
 "Language: ta\n"
@@ -17,348 +17,174 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0.1-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr ""
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr ""
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr ""
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr ""
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, no-c-format
-msgid "%b %d"
-msgstr ""
-
-#: 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"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "Image sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/file_default_widget.vala:62
-msgid "File transfer failed"
+#: main/src/ui/notifications.vala:67
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
+msgid "File sent"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "Image received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s, %s தட்டச்சிடுகின்றனர்…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s, %s தட்டச்சிடுகின்றனர்…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s தட்டச்சிடுகின்றார்…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
+#: main/src/ui/notifications.vala:69
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
+msgid "File received"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
+#: main/src/ui/notifications.vala:99
+msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 #: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
 #: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
 #: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
 #: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
+#: main/src/ui/notifications.vala:113
+#: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
+#, c-format
+msgid "Could not connect to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
+#: main/src/ui/notifications.vala:129
+#, c-format
+msgid "Invitation to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
+#: main/src/ui/notifications.vala:130
+#, c-format
+msgid "%s invited you to %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
+#: main/src/ui/notifications.vala:151
+msgid "Permission request"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
+#: main/src/ui/notifications.vala:152
+#, c-format
+msgid "%s requests the permission to write in %s"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
 #, no-c-format
-msgid "%a, %H∶%M"
+msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "நேற்று"
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
 #, 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:281
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
 msgid "Just now"
 msgstr ""
 
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "Image sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:196
-msgid "File sent"
-msgstr ""
-
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "Image received"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
 msgstr ""
 
-#: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:198
-msgid "File received"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
 msgstr ""
 
-#: main/src/ui/notifications.vala:99
-msgid "Subscription request"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
 msgstr ""
 
-#: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
-#: main/src/ui/add_conversation/conference_details_fragment.vala:189
-#, c-format
-msgid "Could not connect to %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
 msgstr ""
 
-#: main/src/ui/notifications.vala:129
-#, c-format
-msgid "Invitation to %s"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
 msgstr ""
 
-#: main/src/ui/notifications.vala:130
-#, c-format
-msgid "%s invited you to %s"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
 msgstr ""
 
-#: main/src/ui/notifications.vala:151
-msgid "Permission request"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
 msgstr ""
 
-#: main/src/ui/notifications.vala:152
-#, c-format
-msgid "%s requests the permission to write in %s"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152
 #: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
 msgid "Select"
 msgstr ""
 
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: 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/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
 #: 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 ""
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr ""
-
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr ""
-
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr ""
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
+msgid "%s from %s"
 msgstr ""
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
@@ -369,27 +195,29 @@ msgstr ""
 msgid "Request permission"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: main/src/ui/add_conversation/add_conference_dialog.vala:26
-#: main/data/menu_add.ui:13 main/data/shortcuts.ui:24
-msgid "Join Channel"
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
 msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
 msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr ""
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
@@ -400,23 +228,19 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr ""
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr ""
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr ""
@@ -449,66 +273,93 @@ msgstr ""
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
+#: main/src/ui/global_search.vala:140
+#, c-format
+msgid "%i search result"
+msgid_plural "%i search results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "In %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
+#: main/src/ui/global_search.vala:167
+#, c-format
+msgid "With %s"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
 msgstr ""
 
-#: main/src/ui/global_search.vala:140
-#, c-format
-msgid "%i search result"
-msgid_plural "%i search results"
-msgstr[0] ""
-msgstr[1] ""
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
 
-#: main/src/ui/global_search.vala:167
-#, c-format
-msgid "In %s"
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/global_search.vala:167
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
 #, c-format
-msgid "With %s"
+msgid "Default: %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -519,6 +370,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr ""
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr ""
@@ -552,10 +411,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr ""
 
@@ -591,162 +450,265 @@ msgstr ""
 msgid "Room Configuration"
 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"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
 msgstr ""
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr ""
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr ""
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
+msgid "Sign in to %s"
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
 msgstr ""
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
 msgstr ""
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
 msgstr ""
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
 msgstr ""
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
 msgstr ""
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s, %s தட்டச்சிடுகின்றனர்…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s, %s தட்டச்சிடுகின்றனர்…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s தட்டச்சிடுகின்றார்…"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:261
+#, no-c-format
+msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:265
+#, no-c-format
+msgid "%a, %H∶%M"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
+#, no-c-format
+msgid "%a, %l∶%M %p"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/src/ui/conversation_content_view/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "இன்று"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr ""
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr ""
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr ""
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr ""
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 ""
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr ""
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr ""
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
@@ -773,24 +735,20 @@ msgid ""
 "devices."
 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"
+#: main/data/global_search.ui:37
+msgid "No active search"
 msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
 msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
 msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -817,26 +775,67 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
diff --git a/main/po/tr.po b/main/po/tr.po
index 44d7c0d9..2c6f923d 100644
--- a/main/po/tr.po
+++ b/main/po/tr.po
@@ -7,185 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-05-25 16:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-03 06:41+0000\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Dino'ya hoş geldiniz!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Başlamak için oturum açın veya bir hesap oluşturun."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Hesap oluştur"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Etkin hesap yok"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-msgstr "Hesapları yönet"
-
-#: 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:338
-msgid "Yesterday"
-msgstr "Dün"
-
-#: 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:334
-#, 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 "İ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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s ve %i diğerleri yazıyor"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s ve %s yazıyor…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s ve %s yazıyor…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s yazıyor…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Mesaj çok uzun"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "düzenlendi"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Kabul et"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Şifrelenmemiş"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Mesaj gönderilemedi"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Şu an"
+"X-Generator: Weblate 4.2-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -211,9 +41,21 @@ msgstr "Dosya alındı"
 msgid "Subscription request"
 msgstr "Abonelik isteği"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Kabul et"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Reddet"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Bağlantı kurulamadı %s"
@@ -237,129 +79,113 @@ msgstr "İzin isteği"
 msgid "%s requests the permission to write in %s"
 msgstr "%s, %s için yazma izni istiyor"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Hesabı sil %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Sil"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Avatar seç"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Seç"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "İptal"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Ben"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Görseller"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Tüm dosyalar"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Dün"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "Bağlanıyor…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Bağlandı"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Bağlantı koptu"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, 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/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Yanlış parola"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Şu an"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Geçersiz TLS Sertifikası"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Sahip"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Hata"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Yönetici"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Hesap Ekle"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Üye"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "%s'e giriş yap"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Kullanıcı"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Artık %s hesabını kullanabilirsiniz."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Davet et"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Geçersiz adres"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Görüşmeye Davet et"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Yalnış kullanıcı adı veya parola"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Özel sohbet başlat"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Bir şeyler yanlış gitti"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Kov"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Sunucudan yanıt yok"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Yazma izni ver"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Kaydol - %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Yazma iznini iptal et"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Sunucu bir websitesine kayıt olmanı şart koşuyor"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "Dosya seç"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Web sitesini aç"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seç"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Kayıt"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "İptal"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-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:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Ben"
+msgid "%s from %s"
+msgstr "%s - %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr "Bu görüşme mesaj göndermenize izin vermiyor."
 msgid "Request permission"
 msgstr "İzin iste"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "Mesajları ara"
 
-#: main/src/ui/application.vala:200
-#: 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 "Katıl"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "Üyeler"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s - %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Sohbet Başlat"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Ekle"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Başla"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Kanala katıl"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "Ekle"
 msgid "Next"
 msgstr "İleri"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+msgstr "Katıl"
+
 #: 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 "Geri"
 
-#: 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/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"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Katılıyor…"
@@ -449,46 +273,18 @@ msgstr "Başka bir takma isim seçin"
 msgid "Too many occupants in room"
 msgstr "Odada çok fazla katılımcı var"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Sahip"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Yönetici"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Üye"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Kullanıcı"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Davet et"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Görüşmeye Davet et"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Özel bir görüşme başlat"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Kov"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Yazma izni ver"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Geçersiz adres"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Yazma iznini iptal et"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Ekle"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -507,9 +303,64 @@ msgstr "%s içinden"
 msgid "With %s"
 msgstr "%s ile"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "Dosya seç"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Yerel Ayarlar"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "\"Yazıyor\" bildirimi gönder"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "\"Okundu\" bilgisi gönder"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "Bildirimler"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "Açık"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "Kapalı"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "Sadece atıf yapıldığında"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "Varsayılan: %s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "İste"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "İzinler"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "Mesaj göndermek için izin isteyin"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -519,6 +370,14 @@ msgstr "Görüşme Detayları"
 msgid "Contact Details"
 msgstr "Kişi Detayları"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Engelle"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "İletişim ve durum güncellemeler her iki taraf için engellenir"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "Oda ismi"
@@ -552,10 +411,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "Katılımcıların JID'lerini kimler görüntüleyebilir?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "Parola"
 
@@ -591,163 +450,266 @@ msgstr "Odada kaydedilecek maksimum mesaj sayısı"
 msgid "Room Configuration"
 msgstr "Oda Ayarları"
 
-#: 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 "Ayarlar"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Dino'ya hoş geldiniz!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "Engelle"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Başlamak için oturum açın veya bir hesap oluşturun."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "İletişim ve durum güncellemeler her iki taraf için engellenir"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Hesap oluştur"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "İste"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Etkin hesap yok"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "İzinler"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "Hesapları yönet"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "Mesaj göndermek için izin isteyin"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Hesabı sil %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "Yerel Ayarlar"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Sil"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "\"Yazıyor\" bildirimi gönder"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Avatar seç"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "\"Okundu\" bilgisi gönder"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Görseller"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "Bildirimler"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Tüm dosyalar"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "Açık"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "Bağlanıyor…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "Kapalı"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Bağlandı"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "Sadece atıf yapıldığında"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Bağlantı koptu"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Yanlış parola"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Geçersiz TLS Sertifikası"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Hata"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Hesap Ekle"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "Varsayılan: %s"
+msgid "Sign in to %s"
+msgstr "%s'e giriş yap"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "Mesajları ara"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Artık %s hesabını kullanabilirsiniz."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "Üyeler"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Yalnış kullanıcı adı veya parola"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "Dosya gönder"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Bir şeyler yanlış gitti"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "Mesajı güncelle"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Sunucudan yanıt yok"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Mesaj ulaştığında bildirim gönder"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Kaydol - %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "İfadeleri emoji olarak göster"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Sunucu bir websitesine kayıt olmanı şart koşuyor"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "Hesaplar"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Web sitesini aç"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "Yerel mahlas"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Kayıt"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "Hiç hesap ayarlanmamış"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+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/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "Bir hesap ekle"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Mesaj çok uzun"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "Giriş yap"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "düzenlendi"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "Hesap oluştur"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s ve %i diğerleri yazıyor…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "Güvenli bir bağlantı oluşturulamadı"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s ve %s yazıyor…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "Bağlan"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s ve %s yazıyor…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "Genel bir sunucu seç"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s yazıyor…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "Veya özel bir sunucu adresi"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Şifrelenmemiş"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "Bunun yerine oturum açın"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "Mesaj gönderilemedi"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "Başka sunucu seç"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "Hepsi tamam!"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "Bitir"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "Klavye Kısayolları"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "Dino Hakkında"
+#: 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/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/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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Bugün"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %d %b"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "Dosya gönder"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "Mesajı güncelle"
+
+#: main/data/unified_main_content.ui:48
+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:100
+msgid "You have no open chats"
+msgstr "Henüz burada sohbet yok"
+
+#: 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 "Hesap"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Takma isim"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "Mahlas"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "Kişi Ekle"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Mesaj ulaştığında bildirim gönder"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "İfadeleri emoji olarak göster"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -781,25 +743,21 @@ msgstr ""
 "Dino sunucudan konuşma geçmişini sunucudan çeker ve diğer cihazlara "
 "senkronize eder."
 
-#: 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 "Hesap"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "Henüz arama yapılmadı"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "Takma isim"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "Arama başlatmak için bir şey yaz"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "Mahlas"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "Hiç mesaj bulunamadı"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "Kişi Ekle"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "Yazım hatalarını kontrol et ya da filtreleri kaldırmayı dene"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -811,7 +769,7 @@ msgstr "Genel"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "Sohbet"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -819,44 +777,83 @@ msgstr "Navigasyon"
 
 #: main/data/shortcuts.ui:57
 msgid "Jump to next conversation"
-msgstr "Bir sonraki görüşmeye geç"
+msgstr "Bir sonraki sohbete geç"
 
 #: main/data/shortcuts.ui:64
 msgid "Jump to previous conversation"
-msgstr "Bir önceki görüşmeye geç"
+msgstr "Bir önceki sohbete geç"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "Henüz arama yapılmadı"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "Hesaplar"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "Arama başlatmak için bir şey yaz"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "Klavye Kısayolları"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "Hiç mesaj bulunamadı"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "Dino Hakkında"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "Yazım hatalarını kontrol et ya da filtreleri kaldırmayı dene"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "Yerel mahlas"
 
-#: main/data/unified_main_content.ui:48
-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/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "Hiç hesap ayarlanmamış"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "Henüz burada sohbet yok"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "Bir hesap ekle"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "Giriş yap"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "Hesap oluştur"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "Güvenli bir bağlantı oluşturulamadı"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "Bağlan"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "Genel bir sunucu seç"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "Veya özel bir sunucu adresi"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "Bunun yerine oturum açın"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "Başka sunucu seç"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "Hepsi tamam!"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "Bitir"
 
 #~ msgid "No active conversations"
 #~ msgstr "Aktif 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"
 
@@ -866,11 +863,9 @@ msgstr "Henüz burada sohbet yok"
 #~ 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"
 
@@ -882,7 +877,6 @@ msgstr "Henüz burada sohbet yok"
 #~ msgid "has stopped typing"
 #~ msgstr "yazmayı sonlandırdı"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i adet sonuc bulundu"
 
diff --git a/main/po/uk.po b/main/po/uk.po
index d40bcb4e..374d22fe 100644
--- a/main/po/uk.po
+++ b/main/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
 "PO-Revision-Date: 2020-07-07 03:14+0000\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -18,178 +18,6 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "Ласкаво просимо в Діно!"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "Увійдіть в систему або створіть обліковий запис, щоб почати."
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "Налаштування облікового запису"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "Немає активних облікових записів"
-
-#: main/src/ui/main_window.vala:209
-#, fuzzy
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s та %i інших друкують"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s та %s друкують…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s і %s друкують…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, fuzzy, c-format
-msgid "%s is typing…"
-msgstr "%s друкує…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "Повідомлення задовге"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "відредаговано"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "Прийняти"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Нешифровано"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "Не вдалося надіслати повідомлення"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%H∶%M, %x"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%l∶%M, %x %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, 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:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "Щойно"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -214,9 +42,21 @@ msgstr "Файл отримано"
 msgid "Subscription request"
 msgstr "Необхідна авторизація"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "Прийняти"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "Відхилити"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "Не вдалося підключитися до %s"
@@ -240,129 +80,114 @@ msgstr "Запит на дозвіл"
 msgid "%s requests the permission to write in %s"
 msgstr "%s запитує дозвіл писати в %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "Видалити обліковий запис %s?"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "Видалити"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "Вибрати аватар"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "Вибрати"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "Відміна"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "Я"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "Зображення"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "Усі файли"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "Учора"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "З'єднання…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "Під’єднано"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "Роз'єднано"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i хвилина тому"
+msgstr[1] "%i хвилини тому"
+msgstr[2] "%i хвилин тому"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "Хибний пароль"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "Щойно"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "Недійсний сертифікат TLS"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Власник"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "Помилка"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Адміністратор"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "Додати обліковий запис"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Учасник"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "Вхід в обліковий запис %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Користувач"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "Тепер ви можете використовувати обліковий запис %s."
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "Запросити"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "Недійсна адреса"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "Запросити до конференції"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "Неправильне ім'я користувача чи пароль"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "Почати приватну розмову"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "Щось пішло не так"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "Вигнати"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "Немає відповіді від сервера"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "Видати дозвіл писати"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "Зареєструватись в %s"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "Відкликати дозвіл писати"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "Сервер вимагає реєстрації через веб-сайт"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr ""
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "Відкрити веб-сайт"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Вибрати"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "Зареєструватися"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "Відміна"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "Прочитайте %s, щоб дізнатися про процес реєстрації"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "Я"
+msgid "%s from %s"
+msgstr "%s з %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -372,28 +197,30 @@ msgstr "Вам заборонено відправляти повідомлен�
 msgid "Request permission"
 msgstr "Попросити дозвіл"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr ""
 
-#: main/src/ui/application.vala:200
-#: 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 "Приєднатися"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s з %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "Почати розмову"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "Додати"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "Почати"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "Приєднатись до каналу"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -403,23 +230,19 @@ msgstr "Додати"
 msgid "Next"
 msgstr "Далі"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "Почати розмову"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "Почати"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "Приєднання…"
@@ -452,46 +275,18 @@ msgstr "Оберіть інший нікнейм"
 msgid "Too many occupants in room"
 msgstr "У кімнаті занадто багато відвідувачів"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "Власник"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "Адміністратор"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "Учасник"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "Користувач"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "Запросити"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "Запросити до конференції"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "Почати приватну розмову"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "Вигнати"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "Видати дозвіл писати"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "Недійсна адреса"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "Відкликати дозвіл писати"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "Додати"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -511,8 +306,63 @@ msgstr ""
 msgid "With %s"
 msgstr ""
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr ""
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
@@ -523,6 +373,14 @@ msgstr ""
 msgid "Contact Details"
 msgstr ""
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr ""
@@ -556,10 +414,10 @@ 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
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr ""
 
@@ -595,162 +453,266 @@ msgstr ""
 msgid "Room Configuration"
 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 ""
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "Ласкаво просимо в Діно!"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr ""
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "Увійдіть в систему або створіть обліковий запис, щоб почати."
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr ""
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "Налаштування облікового запису"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr ""
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "Немає активних облікових записів"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr ""
+#: main/src/ui/main_window.vala:209
+#, fuzzy
+msgid "Manage accounts"
+msgstr "Керування обліковими записами"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Видалити обліковий запис %s?"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Видалити"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "Вибрати аватар"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "Зображення"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "Усі файли"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "З'єднання…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "Під’єднано"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr ""
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "Роз'єднано"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "Хибний пароль"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "Недійсний сертифікат TLS"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "Помилка"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "Додати обліковий запис"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr ""
+msgid "Sign in to %s"
+msgstr "Вхід в обліковий запис %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "Тепер ви можете використовувати обліковий запис %s."
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "Неправильне ім'я користувача чи пароль"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "Щось пішло не так"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "Немає відповіді від сервера"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "Зареєструватись в %s"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "Сервер вимагає реєстрації через веб-сайт"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "Відкрити веб-сайт"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "Зареєструватися"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr ""
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "Прочитайте %s, щоб дізнатися про процес реєстрації"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr ""
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "Повідомлення задовге"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr ""
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "відредаговано"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr ""
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, fuzzy, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s та %i інших друкують"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s та %s друкують…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s і %s друкують…"
+
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, fuzzy, c-format
+msgid "%s is typing…"
+msgstr "%s друкує…"
+
+#: 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 "%H∶%M, %x"
+
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:258
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%l∶%M, %x %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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "Цей контакт хоче додати вас до свого списку контактів"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "Сьогодні"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a, %b %d"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
+#: 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 ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
 msgstr ""
 
-#: main/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
 msgstr ""
 
-#: main/data/menu_app.ui:21
-msgid "About Dino"
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
 msgstr ""
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
@@ -777,24 +739,20 @@ msgid ""
 "devices."
 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"
+#: main/data/global_search.ui:37
+msgid "No active search"
 msgstr ""
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
 msgstr ""
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
 msgstr ""
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
 msgstr ""
 
 #: main/data/file_send_overlay.ui:80
@@ -821,26 +779,67 @@ msgstr ""
 msgid "Jump to previous conversation"
 msgstr ""
 
-#: main/data/global_search.ui:37
-msgid "No active search"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
 msgstr ""
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
 msgstr ""
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
 msgstr ""
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
 msgstr ""
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr ""
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
 msgstr ""
diff --git a/main/po/zh_CN.po b/main/po/zh_CN.po
index f60da494..67fb6edb 100644
--- a/main/po/zh_CN.po
+++ b/main/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-08-01 20:43+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-08-03 06:41+0000\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "dino/translations/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -18,175 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "欢迎来到 Dino！"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "登录或者创建一个账户后开始。"
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "设置帐户"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "没有活动的帐号"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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 "分享了 %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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s 和其他 %i 个人正在输入"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s 和 %s 正在输入…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s 和 %s 正在输入…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s 正在输入…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "消息太长"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "已編辑"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "接受"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "未加密"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "无法发送消息"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x，%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%_m 月 %_d 日，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%A，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%A，%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分钟以前"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "刚刚"
-
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
 msgid "Image sent"
@@ -211,9 +42,21 @@ msgstr "文件已接收"
 msgid "Subscription request"
 msgstr "订阅请求"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "接受"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "拒绝"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "无法连接到%s"
@@ -237,129 +80,112 @@ msgstr "权限请求"
 msgid "%s requests the permission to write in %s"
 msgstr "%s 请求写入 %s 的权限"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "移除账户 %s？"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "移除"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "选择头像"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "选择"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "取消"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "我"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "图片"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%_m 月 %_d 日"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "所有文件"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "昨天"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "连接中…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "已连接"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "已断开连接"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分钟以前"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "密码错误"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "刚刚"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "无效的 TLS 证书"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "所有者"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "错误"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "管理员"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "添加帐号"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "成员"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "登录到%s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "用户"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "你现在可以使用账户 %s 了。"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "邀请"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "无效的地址"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "邀请到聊天室里"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "错误的用户名或密码"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "启动私密会话"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "出现了一些问题"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "踢出"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "服务器未响应"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "授予写入权限"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "在 %s 注册"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "撤回写入权限"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "服务器要求在网站上注册"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "选择文件"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "打开网站"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "选择"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "注册"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "取消"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "检查 %s 以获取如何注册的信息"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "我"
+msgid "%s from %s"
+msgstr "%s 来自 %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -369,28 +195,30 @@ msgstr "该会议不允许你发送讯息。"
 msgid "Request permission"
 msgstr "请求权限"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "搜索消息"
 
-#: main/src/ui/application.vala:200
-#: 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 "加入"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "成员"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s 来自 %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "开始聊天"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "添加"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "开始"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "加入频道"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -400,23 +228,19 @@ msgstr "添加"
 msgid "Next"
 msgstr "下一个"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "开始聊天"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "开始"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "加入中…"
@@ -449,46 +273,18 @@ msgstr "选择一个不同的昵称"
 msgid "Too many occupants in room"
 msgstr "聊天室内人数过多"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "所有者"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "管理员"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "成员"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "用户"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "邀请"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "邀请到聊天室里"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "启动私密会话"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "踢出"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "授予写入权限"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "无效的地址"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "撤回写入权限"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "添加"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -506,9 +302,64 @@ msgstr "在%s中"
 msgid "With %s"
 msgstr "用%s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "选择文件"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "设置"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "本地设置"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "发送打字通知"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "发送已读回执"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "通知"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "开启"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "关闭"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "只有被提到时"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "默认：%s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "请求"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "权限"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "请求发送讯息的权限"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -518,6 +369,14 @@ msgstr "聊天室详情"
 msgid "Contact Details"
 msgstr "联系人详情"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "封禁"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "双向通讯和状态更新已经被封禁"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "聊天室名称"
@@ -551,10 +410,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "谁被允许查看成员的JID？"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "密码"
 
@@ -590,163 +449,266 @@ msgstr "聊天室储存的历史消息的最大数目"
 msgid "Room Configuration"
 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 "设置"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "欢迎来到 Dino！"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "封禁"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "登录或者创建一个账户后开始。"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "双向通讯和状态更新已经被封禁"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "设置帐户"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "请求"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "没有活动的帐号"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "权限"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "管理帐号"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "请求发送讯息的权限"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "移除账户 %s？"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "本地设置"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "移除"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "发送打字通知"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "选择头像"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "发送已读回执"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "图片"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "通知"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "所有文件"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "开启"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "连接中…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "关闭"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "已连接"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "只有被提到时"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "已断开连接"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "密码错误"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "无效的 TLS 证书"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "错误"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "添加帐号"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "默认：%s"
+msgid "Sign in to %s"
+msgstr "登录到%s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "搜索消息"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "你现在可以使用账户 %s 了。"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "成员"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "错误的用户名或密码"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "发送一个文件"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "出现了一些问题"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "更新讯息"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "服务器未响应"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "新消息到达时通知"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "在 %s 注册"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "将笑脸转换成 Emoji"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "服务器要求在网站上注册"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "帐号"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "打开网站"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "本地别名"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "注册"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "没有配置账户"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "检查 %s 以获取如何注册的信息"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "添加新账号"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "消息太长"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "登录"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "已編辑"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "创建账户"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s 和其他 %i 个人正在输入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "无法建立安全连接"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s 和 %s 正在输入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "连接"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s 和 %s 正在输入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "选择一个公共服务器"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s 正在输入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "或指定一个服务器地址"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "代替登录"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "无法发送消息"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "选择另外一个服务器"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x，%H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "都准备好了！"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "完成"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "键盘快捷键"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "关于 Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "该联系人想把你加到他们的联系人列表"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%a，%b%d日"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "发送一个文件"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "更新讯息"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "点击此处以开始对话或加入频道。"
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 "账号"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "昵称"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "别名"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "增加联系人"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "新消息到达时通知"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "将笑脸转换成 Emoji"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
@@ -776,25 +738,21 @@ msgid ""
 "devices."
 msgstr "Dino 从服务器获取消息并和其他设备同步。"
 
-#: 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 "账号"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "无活动的搜索"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "昵称"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "输入以开始搜索"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "别名"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "无匹配的消息"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "增加联系人"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "检查拼写或尝试移除过滤器"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -806,7 +764,7 @@ msgstr "常规"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "对话"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -820,29 +778,70 @@ msgstr "转到下一个对话"
 msgid "Jump to previous conversation"
 msgstr "转到上一个对话"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "无活动的搜索"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "帐号"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "输入以开始搜索"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "无匹配的消息"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "关于 Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "检查拼写或尝试移除过滤器"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "本地别名"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "点击此处以开始对话或加入频道。"
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "没有配置账户"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "你没有开启的对话"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "添加新账号"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "登录"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "创建账户"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "无法建立安全连接"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "连接"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "选择一个公共服务器"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "或指定一个服务器地址"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "代替登录"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "选择另外一个服务器"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "都准备好了！"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "完成"
 
 #~ msgid "No active conversations"
 #~ msgstr "没有活动的会话"
@@ -850,11 +849,9 @@ msgstr "你没有开启的对话"
 #~ msgid "Main window with conversations"
 #~ msgstr "带有对话的主窗口"
 
-#, c-format
 #~ msgid "%s, %s and %i others"
 #~ msgstr "%s、%s 以及 %i 个其他人"
 
-#, c-format
 #~ msgid "You can now start using %s"
 #~ msgstr "您现在可以开始使用%s"
 
@@ -864,11 +861,9 @@ msgstr "你没有开启的对话"
 #~ msgid "Save"
 #~ msgstr "保存"
 
-#, c-format
 #~ msgid "%s, %s and %s"
 #~ msgstr "%s、%s 和 %s"
 
-#, c-format
 #~ msgid "%s and %s"
 #~ msgstr "%s 和 %s"
 
@@ -879,7 +874,6 @@ msgstr "你没有开启的对话"
 #~ msgid "has stopped typing"
 #~ msgstr "已经停止输入"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i 搜索结果"
 
diff --git a/main/po/zh_TW.po b/main/po/zh_TW.po
index 850cbb43..eb310b39 100644
--- a/main/po/zh_TW.po
+++ b/main/po/zh_TW.po
@@ -7,184 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 22:50+0200\n"
-"PO-Revision-Date: 2020-07-09 07:41+0000\n"
+"POT-Creation-Date: 2020-09-10 20:10+0200\n"
+"PO-Revision-Date: 2020-09-02 21:36+0000\n"
 "Language-Team: none\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 4.2-dev\n"
-
-#: main/src/ui/main_window.vala:198
-msgid "Welcome to Dino!"
-msgstr "歡迎來到 Dino！"
-
-#: main/src/ui/main_window.vala:199
-msgid "Sign in or create an account to get started."
-msgstr "開始前請先登入或建立一個帳號。"
-
-#: main/src/ui/main_window.vala:200
-msgid "Set up account"
-msgstr "設定帳號"
-
-#: main/src/ui/main_window.vala:208
-msgid "No active accounts"
-msgstr "没有啟用的帳號"
-
-#: main/src/ui/main_window.vala:209
-msgid "Manage accounts"
-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:338
-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:334
-#, 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
-#, fuzzy, c-format
-msgid "%s, %s and %i others are typing…"
-msgstr "%s, %s 和其他 %i 個人正在輸入"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
-#, c-format
-msgid "%s, %s and %s are typing…"
-msgstr "%s, %s 和 %s 正在輸入…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
-#, c-format
-msgid "%s and %s are typing…"
-msgstr "%s 和 %s 正在輸入…"
-
-#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
-#, c-format
-msgid "%s is typing…"
-msgstr "%s 正在輸入…"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:158
-msgid "Message too long"
-msgstr "訊息太長"
-
-#: main/src/ui/conversation_content_view/message_widget.vala:186
-msgid "edited"
-msgstr "已編輯"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:37
-#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
-#: main/src/ui/notifications.vala:162
-msgid "Accept"
-msgstr "同意"
-
-#: main/src/ui/conversation_content_view/subscription_notification.vala:38
-#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
-#: main/src/ui/notifications.vala:161
-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:167
-#: main/data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "未加密"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:203
-msgid "Unable to send message"
-msgstr "無法傳送訊息"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:262
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:263
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x，%p%l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:266
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b%d日，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:267
-#, 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:270
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%A，%H∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:271
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%A，%p%l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H:%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:275
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%p%l∶%M"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:279
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分鐘前"
-
-#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:281
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
-msgid "Just now"
-msgstr "剛才"
+"X-Generator: Weblate 4.3-dev\n"
 
 #: main/src/ui/notifications.vala:67
 #: main/src/ui/conversation_selector/conversation_selector_row.vala:196
@@ -210,9 +41,21 @@ msgstr "檔案已接收"
 msgid "Subscription request"
 msgstr "線上狀態訂閱請求"
 
+#: main/src/ui/notifications.vala:106 main/src/ui/notifications.vala:141
+#: main/src/ui/notifications.vala:162
+#: main/src/ui/conversation_content_view/subscription_notification.vala:37
+msgid "Accept"
+msgstr "同意"
+
+#: main/src/ui/notifications.vala:107 main/src/ui/notifications.vala:140
+#: main/src/ui/notifications.vala:161
+#: main/src/ui/conversation_content_view/subscription_notification.vala:38
+msgid "Deny"
+msgstr "拒絕"
+
 #: main/src/ui/notifications.vala:113
-#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #: main/src/ui/add_conversation/conference_details_fragment.vala:189
+#: main/src/ui/manage_accounts/add_account_dialog.vala:258
 #, c-format
 msgid "Could not connect to %s"
 msgstr "無法連線到 %s"
@@ -236,129 +79,112 @@ msgstr "權限請求"
 msgid "%s requests the permission to write in %s"
 msgstr "%s 請求權限以寫入 %s"
 
-#: main/src/ui/manage_accounts/dialog.vala:125
-#, c-format
-msgid "Remove account %s?"
-msgstr "移除帳號 %s ？"
-
-#: main/src/ui/manage_accounts/dialog.vala:128
-msgid "Remove"
-msgstr "移除"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-msgid "Select avatar"
-msgstr "選取頭像"
-
-#: main/src/ui/manage_accounts/dialog.vala:152
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select"
-msgstr "選取"
-
-#: main/src/ui/manage_accounts/dialog.vala:152 main/src/ui/application.vala:200
-#: 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/src/ui/conversation_view_controller.vala:205
-#: 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 "取消"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
+#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
+msgid "Me"
+msgstr "我"
 
-#: main/src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr "影像"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:334
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:98
+#, no-c-format
+msgid "%b %d"
+msgstr "%b%d日"
 
-#: main/src/ui/manage_accounts/dialog.vala:163
-msgid "All files"
-msgstr "所有檔案"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:338
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:89
+msgid "Yesterday"
+msgstr "昨天"
 
-#: main/src/ui/manage_accounts/dialog.vala:219
-msgid "Connecting…"
-msgstr "正在連線…"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:341
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:269
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:221
-msgid "Connected"
-msgstr "已連線"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:342
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:270
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%p%l∶%M"
 
-#: main/src/ui/manage_accounts/dialog.vala:223
-msgid "Disconnected"
-msgstr "連線已斷開"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:345
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:274
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分鐘前"
 
-#: main/src/ui/manage_accounts/dialog.vala:232
-msgid "Wrong password"
-msgstr "密碼錯誤"
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:347
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:276
+msgid "Just now"
+msgstr "剛才"
 
-#: main/src/ui/manage_accounts/dialog.vala:234
-msgid "Invalid TLS certificate"
-msgstr "無效的 TLS 憑證"
+#: main/src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "主人"
 
-#: main/src/ui/manage_accounts/dialog.vala:237
-#: main/src/ui/manage_accounts/dialog.vala:239
-msgid "Error"
-msgstr "錯誤"
+#: main/src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "管理員"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:82
-msgid "Add Account"
-msgstr "新增帳號"
+#: main/src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "成員"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:166
-#, c-format
-msgid "Sign in to %s"
-msgstr "登入到 %s"
+#: main/src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "使用者"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:210
-#, c-format
-msgid "You can now use the account %s."
-msgstr "您現在可以使用帳號 %s 了。"
+#: main/src/ui/occupant_menu/view.vala:40
+#: main/src/ui/occupant_menu/view.vala:49
+msgid "Invite"
+msgstr "邀請"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:263
-#: main/src/ui/manage_accounts/add_account_dialog.vala:296
-#: main/src/ui/manage_accounts/add_account_dialog.vala:306
-#: main/src/ui/manage_accounts/add_account_dialog.vala:382
-#: main/src/ui/add_conversation/conference_details_fragment.vala:192
-msgid "Invalid address"
-msgstr "無效的位址"
+#: main/src/ui/occupant_menu/view.vala:48
+msgid "Invite to Conference"
+msgstr "邀請加入聊天室"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:278
-msgid "Wrong username or password"
-msgstr "使用者名稱或密碼錯誤"
+#: main/src/ui/occupant_menu/view.vala:94
+msgid "Start private conversation"
+msgstr "開始私人對話"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:281
-msgid "Something went wrong"
-msgstr "出現了錯誤"
+#: main/src/ui/occupant_menu/view.vala:102
+msgid "Kick"
+msgstr "踢走"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:321
-msgid "No response from server"
-msgstr "伺服器没有回應"
+#: main/src/ui/occupant_menu/view.vala:108
+msgid "Grant write permission"
+msgstr "同意寫入權限"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:327
-#, c-format
-msgid "Register on %s"
-msgstr "在 %s 註冊"
+#: main/src/ui/occupant_menu/view.vala:114
+msgid "Revoke write permission"
+msgstr "撤回寫入權限"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:330
-msgid "The server requires to sign up through a website"
-msgstr "伺服器要求通過網頁進行註冊"
+#: main/src/ui/conversation_view_controller.vala:205
+msgid "Select file"
+msgstr "選取檔案"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:332
-msgid "Open website"
-msgstr "開啟網頁"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "選取"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:344
-msgid "Register"
-msgstr "註冊"
+#: main/src/ui/conversation_view_controller.vala:205
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
+#: main/src/ui/add_conversation/add_conference_dialog.vala:15
+#: main/src/ui/add_conversation/add_conference_dialog.vala:122
+#: main/src/ui/application.vala:200 main/src/ui/manage_accounts/dialog.vala:152
+#: 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 "取消"
 
-#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#: main/src/ui/util/helper.vala:127
 #, c-format
-msgid "Check %s for information on how to sign up"
-msgstr "查閱 %s 以取得關於如何註冊的資訊"
-
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:165
-#: main/src/ui/conversation_selector/conversation_selector_row.vala:190
-#: main/src/ui/util/helper.vala:137 main/src/ui/util/helper.vala:152
-msgid "Me"
-msgstr "我"
+msgid "%s from %s"
+msgstr "%s 來自 %s"
 
 #: main/src/ui/chat_input/chat_input_controller.vala:177
 msgid "This conference does not allow you to send messages."
@@ -368,28 +194,30 @@ msgstr "此聊天室不允許您傳送訊息。"
 msgid "Request permission"
 msgstr "請求權限"
 
-#: main/src/ui/application.vala:200
-#: 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_titlebar/search_entry.vala:11
+#: main/data/shortcuts.ui:37
+msgid "Search messages"
+msgstr "搜尋訊息"
 
-#: main/src/ui/application.vala:200
-#: 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 "加入"
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr "成員"
 
-#: main/src/ui/util/helper.vala:127
-#, c-format
-msgid "%s from %s"
-msgstr "%s 來自 %s"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/data/conversation_list_titlebar_csd.ui:12 main/data/menu_add.ui:7
+#: main/data/shortcuts.ui:17 main/data/conversation_list_titlebar.ui:16
+msgid "Start Conversation"
+msgstr "開始對話"
 
-#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
-#: main/data/add_conversation/add_contact_dialog.ui:24
-msgid "Add"
-msgstr "新增"
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
+msgid "Start"
+msgstr "開始"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:26
+#: main/src/ui/application.vala:200 main/data/menu_add.ui:13
+#: main/data/shortcuts.ui:24
+msgid "Join Channel"
+msgstr "加入頻道"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:118
@@ -399,23 +227,19 @@ msgstr "新增"
 msgid "Next"
 msgstr "下一個"
 
+#: 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
+#: main/src/ui/application.vala:200
+msgid "Join"
+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/data/conversation_list_titlebar_csd.ui:12
-#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
-#: main/data/shortcuts.ui:17
-msgid "Start Conversation"
-msgstr "開始對話"
-
-#: main/src/ui/add_conversation/select_contact_dialog.vala:98
-msgid "Start"
-msgstr "開始"
-
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Joining…"
 msgstr "正在加入…"
@@ -448,46 +272,18 @@ msgstr "選取一個不同的暱稱"
 msgid "Too many occupants in room"
 msgstr "聊天室人數過多"
 
-#: main/src/ui/occupant_menu/list.vala:105
-msgid "Owner"
-msgstr "主人"
-
-#: main/src/ui/occupant_menu/list.vala:107
-msgid "Admin"
-msgstr "管理員"
-
-#: main/src/ui/occupant_menu/list.vala:109
-msgid "Member"
-msgstr "成員"
-
-#: main/src/ui/occupant_menu/list.vala:111
-msgid "User"
-msgstr "使用者"
-
-#: main/src/ui/occupant_menu/view.vala:40
-#: main/src/ui/occupant_menu/view.vala:49
-msgid "Invite"
-msgstr "邀請"
-
-#: main/src/ui/occupant_menu/view.vala:48
-msgid "Invite to Conference"
-msgstr "邀請加入聊天室"
-
-#: main/src/ui/occupant_menu/view.vala:94
-msgid "Start private conversation"
-msgstr "開始私人對話"
-
-#: main/src/ui/occupant_menu/view.vala:102
-msgid "Kick"
-msgstr "踢走"
-
-#: main/src/ui/occupant_menu/view.vala:108
-msgid "Grant write permission"
-msgstr "同意寫入權限"
+#: main/src/ui/add_conversation/conference_details_fragment.vala:192
+#: main/src/ui/manage_accounts/add_account_dialog.vala:263
+#: main/src/ui/manage_accounts/add_account_dialog.vala:296
+#: main/src/ui/manage_accounts/add_account_dialog.vala:306
+#: main/src/ui/manage_accounts/add_account_dialog.vala:382
+msgid "Invalid address"
+msgstr "無效的位址"
 
-#: main/src/ui/occupant_menu/view.vala:114
-msgid "Revoke write permission"
-msgstr "撤回寫入權限"
+#: main/src/ui/add_conversation/add_groupchat_dialog.vala:26
+#: main/data/add_conversation/add_contact_dialog.ui:24
+msgid "Add"
+msgstr "新增"
 
 #: main/src/ui/global_search.vala:140
 #, c-format
@@ -505,9 +301,64 @@ msgstr "在 %s"
 msgid "With %s"
 msgstr "和 %s"
 
-#: main/src/ui/conversation_view_controller.vala:205
-msgid "Select file"
-msgstr "選取檔案"
+#: main/src/ui/contact_details/settings_provider.vala:12
+#: main/src/ui/contact_details/blocking_provider.vala:31
+#: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
+msgid "Settings"
+msgstr "設定"
+
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "本地設定"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
+#: main/data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "傳送「正在輸入」提示"
+
+#: main/src/ui/contact_details/settings_provider.vala:33
+#: main/data/settings_dialog.ui:34
+msgid "Send read receipts"
+msgstr "傳送已讀回條"
+
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
+msgid "Notifications"
+msgstr "通知"
+
+#: main/src/ui/contact_details/settings_provider.vala:83
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:125
+msgid "On"
+msgstr "啟用"
+
+#: main/src/ui/contact_details/settings_provider.vala:85
+#: main/src/ui/contact_details/settings_provider.vala:123
+#: main/src/ui/contact_details/settings_provider.vala:126
+msgid "Off"
+msgstr "停用"
+
+#: main/src/ui/contact_details/settings_provider.vala:87
+msgid "Only when mentioned"
+msgstr "僅限被提及時"
+
+#: main/src/ui/contact_details/settings_provider.vala:89
+#: main/src/ui/contact_details/settings_provider.vala:124
+#, c-format
+msgid "Default: %s"
+msgstr "預設：%s"
+
+#: main/src/ui/contact_details/permissions_provider.vala:23
+msgid "Request"
+msgstr "請求"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Permissions"
+msgstr "權限"
+
+#: main/src/ui/contact_details/permissions_provider.vala:25
+msgid "Request permission to send messages"
+msgstr "請求權限以傳送訊息"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
@@ -517,6 +368,14 @@ msgstr "聊天室詳細資訊"
 msgid "Contact Details"
 msgstr "聯絡人詳細資訊"
 
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "封鎖"
+
+#: main/src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "雙向的通訊以及狀態更新被封鎖"
+
 #: main/src/ui/contact_details/muc_config_form_provider.vala:50
 msgid "Name of the room"
 msgstr "聊天室名稱"
@@ -550,10 +409,10 @@ msgid "Who is allowed to view the occupants' JIDs?"
 msgstr "誰可以檢視成員的 JID？"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:70
-#: main/data/manage_accounts/dialog.ui:170
-#: main/data/manage_accounts/add_account_dialog.ui:211
 #: main/data/add_conversation/conference_details_fragment.ui:175
 #: main/data/add_conversation/add_groupchat_dialog.ui:147
+#: main/data/manage_accounts/dialog.ui:170
+#: main/data/manage_accounts/add_account_dialog.ui:211
 msgid "Password"
 msgstr "密碼"
 
@@ -589,167 +448,270 @@ msgstr "聊天室儲存的訊息紀錄的最大數目"
 msgid "Room Configuration"
 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 "設定"
+#: main/src/ui/main_window.vala:198
+msgid "Welcome to Dino!"
+msgstr "歡迎來到 Dino！"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Block"
-msgstr "封鎖"
+#: main/src/ui/main_window.vala:199
+msgid "Sign in or create an account to get started."
+msgstr "開始前請先登入或建立一個帳號。"
 
-#: main/src/ui/contact_details/blocking_provider.vala:31
-msgid "Communication and status updates in either direction are blocked"
-msgstr "雙向的通訊以及狀態更新被封鎖"
+#: main/src/ui/main_window.vala:200
+msgid "Set up account"
+msgstr "設定帳號"
 
-#: main/src/ui/contact_details/permissions_provider.vala:23
-msgid "Request"
-msgstr "請求"
+#: main/src/ui/main_window.vala:208
+msgid "No active accounts"
+msgstr "没有啟用的帳號"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Permissions"
-msgstr "權限"
+#: main/src/ui/main_window.vala:209
+msgid "Manage accounts"
+msgstr "管理帳號"
 
-#: main/src/ui/contact_details/permissions_provider.vala:25
-msgid "Request permission to send messages"
-msgstr "請求權限以傳送訊息"
+#: main/src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "移除帳號 %s ？"
 
-#: main/src/ui/contact_details/settings_provider.vala:13
-msgid "Local Settings"
-msgstr "本地設定"
+#: main/src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "移除"
 
-#: main/src/ui/contact_details/settings_provider.vala:28
-#: main/data/settings_dialog.ui:22
-msgid "Send typing notifications"
-msgstr "傳送「正在輸入」提示"
+#: main/src/ui/manage_accounts/dialog.vala:152
+msgid "Select avatar"
+msgstr "選取頭像"
 
-#: main/src/ui/contact_details/settings_provider.vala:33
-#: main/data/settings_dialog.ui:34
-msgid "Send read receipts"
-msgstr "傳送已讀回條"
+#: main/src/ui/manage_accounts/dialog.vala:159
+msgid "Images"
+msgstr "影像"
 
-#: main/src/ui/contact_details/settings_provider.vala:38
-#: main/src/ui/contact_details/settings_provider.vala:47
-msgid "Notifications"
-msgstr "通知"
+#: main/src/ui/manage_accounts/dialog.vala:163
+msgid "All files"
+msgstr "所有檔案"
 
-#: main/src/ui/contact_details/settings_provider.vala:83
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:125
-msgid "On"
-msgstr "啟用"
+#: main/src/ui/manage_accounts/dialog.vala:219
+msgid "Connecting…"
+msgstr "正在連線…"
 
-#: main/src/ui/contact_details/settings_provider.vala:85
-#: main/src/ui/contact_details/settings_provider.vala:123
-#: main/src/ui/contact_details/settings_provider.vala:126
-msgid "Off"
-msgstr "停用"
+#: main/src/ui/manage_accounts/dialog.vala:221
+msgid "Connected"
+msgstr "已連線"
 
-#: main/src/ui/contact_details/settings_provider.vala:87
-msgid "Only when mentioned"
-msgstr "僅限被提及時"
+#: main/src/ui/manage_accounts/dialog.vala:223
+msgid "Disconnected"
+msgstr "連線已斷開"
 
-#: main/src/ui/contact_details/settings_provider.vala:89
-#: main/src/ui/contact_details/settings_provider.vala:124
+#: main/src/ui/manage_accounts/dialog.vala:232
+msgid "Wrong password"
+msgstr "密碼錯誤"
+
+#: main/src/ui/manage_accounts/dialog.vala:234
+msgid "Invalid TLS certificate"
+msgstr "無效的 TLS 憑證"
+
+#: main/src/ui/manage_accounts/dialog.vala:237
+#: main/src/ui/manage_accounts/dialog.vala:239
+msgid "Error"
+msgstr "錯誤"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:82
+msgid "Add Account"
+msgstr "新增帳號"
+
+#: main/src/ui/manage_accounts/add_account_dialog.vala:166
 #, c-format
-msgid "Default: %s"
-msgstr "預設：%s"
+msgid "Sign in to %s"
+msgstr "登入到 %s"
 
-#: main/src/ui/conversation_titlebar/search_entry.vala:11
-#: main/data/shortcuts.ui:37
-msgid "Search messages"
-msgstr "搜尋訊息"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:210
+#, c-format
+msgid "You can now use the account %s."
+msgstr "您現在可以使用帳號 %s 了。"
 
-#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
-msgid "Members"
-msgstr "成員"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:278
+msgid "Wrong username or password"
+msgstr "使用者名稱或密碼錯誤"
 
-#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
-#: main/data/shortcuts.ui:44
-msgid "Send a file"
-msgstr "傳送檔案"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:281
+msgid "Something went wrong"
+msgstr "出現了錯誤"
 
-#: main/data/message_item_widget_edit_mode.ui:60
-msgid "Update message"
-msgstr "更新訊息"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:321
+msgid "No response from server"
+msgstr "伺服器没有回應"
 
-#: main/data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "有新訊息時提醒"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:327
+#, c-format
+msgid "Register on %s"
+msgstr "在 %s 註冊"
 
-#: main/data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "將文字表情轉換爲表情圖標"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:330
+msgid "The server requires to sign up through a website"
+msgstr "伺服器要求通過網頁進行註冊"
 
-#: main/data/manage_accounts/dialog.ui:9 main/data/menu_app.ui:7
-msgid "Accounts"
-msgstr "帳諕"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:332
+msgid "Open website"
+msgstr "開啟網頁"
 
-#: main/data/manage_accounts/dialog.ui:200
-msgid "Local alias"
-msgstr "本地別名"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:344
+msgid "Register"
+msgstr "註冊"
 
-#: main/data/manage_accounts/dialog.ui:255
-msgid "No accounts configured"
-msgstr "未有設定好的帳號"
+#: main/src/ui/manage_accounts/add_account_dialog.vala:346
+#, c-format
+msgid "Check %s for information on how to sign up"
+msgstr "查閱 %s 以取得關於如何註冊的資訊"
 
-#: main/data/manage_accounts/dialog.ui:266
-msgid "Add an account"
-msgstr "新增帳號"
+#: main/src/ui/conversation_content_view/message_widget.vala:157
+msgid "Message too long"
+msgstr "訊息太長"
 
-#: main/data/manage_accounts/add_account_dialog.ui:31
-msgid "Sign in"
-msgstr "登入"
+#: main/src/ui/conversation_content_view/message_widget.vala:185
+msgid "edited"
+msgstr "已編輯"
 
-#: main/data/manage_accounts/add_account_dialog.ui:78
-#: main/data/manage_accounts/add_account_dialog.ui:328
-msgid "Create account"
-msgstr "建立帳號"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:110
+#, c-format
+msgid "%s, %s and %i others are typing…"
+msgstr "%s, %s 和其他 %i 個人正在輸入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:153
-msgid "Could not establish a secure connection"
-msgstr "無法建立安全連線"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:112
+#, c-format
+msgid "%s, %s and %s are typing…"
+msgstr "%s, %s 和 %s 正在輸入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:288
-msgid "Connect"
-msgstr "連線"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:114
+#, c-format
+msgid "%s and %s are typing…"
+msgstr "%s 和 %s 正在輸入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:340
-msgid "Choose a public server"
-msgstr "選取一個公眾伺服器"
+#: main/src/ui/conversation_content_view/chat_state_populator.vala:116
+#, c-format
+msgid "%s is typing…"
+msgstr "%s 正在輸入…"
 
-#: main/data/manage_accounts/add_account_dialog.ui:369
-msgid "Or specify a server address"
-msgstr "或指定一個伺服器位址"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:162
+#: main/data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
 
-#: main/data/manage_accounts/add_account_dialog.ui:389
-msgid "Sign in instead"
-msgstr "登入"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:198
+msgid "Unable to send message"
+msgstr "無法傳送訊息"
 
-#: main/data/manage_accounts/add_account_dialog.ui:470
-msgid "Pick another server"
-msgstr "選取另一臺伺服器"
+#: main/src/ui/conversation_content_view/conversation_item_skeleton.vala:257
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x，%H∶%M"
 
-#: main/data/manage_accounts/add_account_dialog.ui:542
-msgid "All set up!"
-msgstr "全部設定好了！"
+#: 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/data/manage_accounts/add_account_dialog.ui:578
-msgid "Finish"
-msgstr "完成"
+#: 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/data/menu_app.ui:17
-msgid "Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵"
+#: 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/data/menu_app.ui:21
-msgid "About Dino"
-msgstr "關於 Dino"
+#: 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/subscription_notification.vala:48
+msgid "This contact would like to add you to their contact list"
+msgstr "此聯絡人想把您新增到他們的聯絡人清單"
+
+#: 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/date_separator_populator.vala:83
+msgid "Today"
+msgstr "今天"
+
+#: main/src/ui/conversation_content_view/date_separator_populator.vala:96
+msgid "%a, %b %d"
+msgstr "%b%d日，%A"
+
+#: main/data/chat_input.ui:22 main/data/file_send_overlay.ui:28
+#: main/data/shortcuts.ui:44
+msgid "Send a file"
+msgstr "傳送檔案"
+
+#: main/data/message_item_widget_edit_mode.ui:60
+msgid "Update message"
+msgstr "更新訊息"
+
+#: main/data/unified_main_content.ui:48
+msgid "Click here to start a conversation or join a channel."
+msgstr "點擊此處開始對話或加入頻道。"
+
+#: main/data/unified_main_content.ui:100
+msgid "You have no open chats"
+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 "帳號"
+
+#: main/data/add_conversation/conference_details_fragment.ui:123
+#: main/data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "暱稱"
+
+#: main/data/add_conversation/add_groupchat_dialog.ui:175
+#: main/data/add_conversation/add_contact_dialog.ui:102
+msgid "Alias"
+msgstr "別名"
+
+#: main/data/add_conversation/add_contact_dialog.ui:8
+msgid "Add Contact"
+msgstr "新增聯絡人"
+
+#: main/data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "有新訊息時提醒"
+
+#: main/data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "將文字表情轉換爲表情圖標"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr "現代化的 XMPP 聊天用戶端軟件"
+msgstr "現代化的 XMPP 用戶端聊天軟件"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
@@ -775,25 +737,21 @@ msgid ""
 "devices."
 msgstr "Dino 從伺服器取得訊息並與其他裝置同步。"
 
-#: 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 "帳號"
+#: main/data/global_search.ui:37
+msgid "No active search"
+msgstr "目前没有搜尋"
 
-#: main/data/add_conversation/conference_details_fragment.ui:123
-#: main/data/add_conversation/add_groupchat_dialog.ui:120
-msgid "Nick"
-msgstr "暱稱"
+#: main/data/global_search.ui:52
+msgid "Type to start a search"
+msgstr "輸入關鍵字進行搜尋"
 
-#: main/data/add_conversation/add_groupchat_dialog.ui:175
-#: main/data/add_conversation/add_contact_dialog.ui:102
-msgid "Alias"
-msgstr "別名"
+#: main/data/global_search.ui:85
+msgid "No matching messages"
+msgstr "找不到符合條件的訊息"
 
-#: main/data/add_conversation/add_contact_dialog.ui:8
-msgid "Add Contact"
-msgstr "新增聯絡人"
+#: main/data/global_search.ui:100
+msgid "Check the spelling or try to remove filters"
+msgstr "檢查拼字或嘗試移除篩選器"
 
 #: main/data/file_send_overlay.ui:80
 msgid "Send"
@@ -805,7 +763,7 @@ msgstr "一般"
 
 #: main/data/shortcuts.ui:32
 msgid "Conversation"
-msgstr ""
+msgstr "對話"
 
 #: main/data/shortcuts.ui:52
 msgid "Navigation"
@@ -819,29 +777,70 @@ msgstr "跳到下一個對話"
 msgid "Jump to previous conversation"
 msgstr "跳到上一個對話"
 
-#: main/data/global_search.ui:37
-msgid "No active search"
-msgstr "目前没有搜尋"
+#: main/data/menu_app.ui:7 main/data/manage_accounts/dialog.ui:9
+msgid "Accounts"
+msgstr "帳諕"
 
-#: main/data/global_search.ui:52
-msgid "Type to start a search"
-msgstr "輸入關鍵字進行搜尋"
+#: main/data/menu_app.ui:17
+msgid "Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵"
 
-#: main/data/global_search.ui:85
-msgid "No matching messages"
-msgstr "找不到符合條件的訊息"
+#: main/data/menu_app.ui:21
+msgid "About Dino"
+msgstr "關於 Dino"
 
-#: main/data/global_search.ui:100
-msgid "Check the spelling or try to remove filters"
-msgstr "檢查拼字或嘗試移除篩選器"
+#: main/data/manage_accounts/dialog.ui:200
+msgid "Local alias"
+msgstr "本地別名"
 
-#: main/data/unified_main_content.ui:48
-msgid "Click here to start a conversation or join a channel."
-msgstr "點擊此處開始對話或加入頻道。"
+#: main/data/manage_accounts/dialog.ui:255
+msgid "No accounts configured"
+msgstr "未有設定好的帳號"
 
-#: main/data/unified_main_content.ui:100
-msgid "You have no open chats"
-msgstr "您没有開啟的對話"
+#: main/data/manage_accounts/dialog.ui:266
+msgid "Add an account"
+msgstr "新增帳號"
+
+#: main/data/manage_accounts/add_account_dialog.ui:31
+msgid "Sign in"
+msgstr "登入"
+
+#: main/data/manage_accounts/add_account_dialog.ui:78
+#: main/data/manage_accounts/add_account_dialog.ui:328
+msgid "Create account"
+msgstr "建立帳號"
+
+#: main/data/manage_accounts/add_account_dialog.ui:153
+msgid "Could not establish a secure connection"
+msgstr "無法建立安全連線"
+
+#: main/data/manage_accounts/add_account_dialog.ui:288
+msgid "Connect"
+msgstr "連線"
+
+#: main/data/manage_accounts/add_account_dialog.ui:340
+msgid "Choose a public server"
+msgstr "選取一個公眾伺服器"
+
+#: main/data/manage_accounts/add_account_dialog.ui:369
+msgid "Or specify a server address"
+msgstr "或指定一個伺服器位址"
+
+#: main/data/manage_accounts/add_account_dialog.ui:389
+msgid "Sign in instead"
+msgstr "登入"
+
+#: main/data/manage_accounts/add_account_dialog.ui:470
+msgid "Pick another server"
+msgstr "選取另一臺伺服器"
+
+#: main/data/manage_accounts/add_account_dialog.ui:542
+msgid "All set up!"
+msgstr "全部設定好了！"
+
+#: main/data/manage_accounts/add_account_dialog.ui:578
+msgid "Finish"
+msgstr "完成"
 
 #~ msgid "No active conversations"
 #~ msgstr "没有進行中的對話"
@@ -849,11 +848,9 @@ msgstr "您没有開啟的對話"
 #~ msgid "Main window with conversations"
 #~ msgstr "含有對話的主視窗"
 
-#, c-format
 #~ msgid "%s, %s and %i others"
 #~ msgstr "%s、%s 和另外 %i 人"
 
-#, c-format
 #~ msgid "You can now start using %s"
 #~ msgstr "您現在可以開始使用 %s"
 
@@ -863,11 +860,9 @@ msgstr "您没有開啟的對話"
 #~ msgid "Save"
 #~ msgstr "儲存"
 
-#, c-format
 #~ msgid "%s, %s and %s"
 #~ msgstr "%s、%s 和 %s"
 
-#, c-format
 #~ msgid "%s and %s"
 #~ msgstr "%s 和 %s"
 
@@ -878,7 +873,6 @@ msgstr "您没有開啟的對話"
 #~ msgid "has stopped typing"
 #~ msgstr "已經停止輸入"
 
-#, c-format
 #~ msgid "%i search results"
 #~ msgstr "%i 個搜尋結果"