diff --git a/client/src/locale/en/translation.json b/client/src/locale/en/translation.json
index 36d276f..78b607f 100644
--- a/client/src/locale/en/translation.json
+++ b/client/src/locale/en/translation.json
@@ -1,131 +1,131 @@
 {
-  "severity": "",
+  "accept_call_audio": "Accept in audio",
+  "accept_call_video": "Accept in video",
+  "admin_creation_submit_button": "Create admin account",
+  "calling": "Calling {{member0}}",
   "change_picture": "Change the picture",
-  "message_swarm_created": "Swarm created",
-  "message_call_outgoing_missed": "Missed outgoing call",
-  "message_call_incoming_missed": "Missed incoming call",
-  "message_call_outgoing": "Outgoing call - {{duration}}",
-  "message_call_incoming": "Incoming call - {{duration}}",
-  "message_member_joined": "{{user}} joined",
-  "ongoing_call_unmuted": "Ongoing call",
-  "ongoing_call_muted": "Ongoing call (muted)",
+  "connecting": "Connecting...",
   "connecting_call": "Connecting...",
-  "outgoing_call": "Outgoing call",
-  "incoming_call": "Incoming call",
+  "conversation_add_contact": "Add contact",
+  "conversation_add_contact_form": "Add a contact",
+  "conversation_ask_confirm_block": "Would you really like to block this conversation?",
+  "conversation_ask_confirm_remove": "Would you really like to remove this conversation?",
+  "conversation_block": "Block conversation",
+  "conversation_close": "Close this conversation",
+  "conversation_confirm_block": "Block",
+  "conversation_confirm_remove": "Remove",
+  "conversation_delete": "Remove conversation",
+  "conversation_details": "Conversation details",
+  "conversation_details_identifier": "Identifier",
+  "conversation_details_informations": "Informations",
+  "conversation_details_is_swarm": "Is swarm",
+  "conversation_details_is_swarm_false": "False",
+  "conversation_details_is_swarm_true": "True",
+  "conversation_details_name": "Title",
+  "conversation_details_qr_code": "QR code",
   "conversation_message": "Message",
   "conversation_start_audiocall": "Start audio call",
   "conversation_start_videocall": "Start video call",
-  "conversation_close": "Close this conversation",
-  "conversation_details": "Conversation details",
-  "conversation_delete": "Remove conversation",
-  "conversation_details_name": "Title",
-  "conversation_details_identifier": "Identifier",
-  "conversation_details_qr_code": "QR code",
-  "conversation_details_is_swarm": "Is swarm",
-  "conversation_details_is_swarm_true": "True",
-  "conversation_details_is_swarm_false": "False",
-  "conversation_details_informations": "Informations",
-  "dialog_confirm_title_default": "Confirm action",
-  "conversation_ask_confirm_remove": "Would you really like to remove this conversation?",
-  "conversation_confirm_remove": "Remove",
-  "select_placeholder": "Select an option",
-  "dialog_close": "Close",
-  "dialog_cancel": "Cancel",
-  "Menu": "Menu",
-  "settings_account": "Account settings",
-  "settings_general": "General settings",
-  "logout": "Log out",
-  "username_input_helper_text_success": "Username available",
-  "username_input_helper_text_taken": "Username already taken",
-  "username_input_helper_text_invalid": "Username doesn't follow required pattern",
-  "username_input_helper_text_registration_failed": "Username not correct!",
-  "username_input_helper_text": "",
-  "username_rules_dialog_title": "Username rules",
-  "username_input_label": "Choose an identifier",
-  "password_input_helper_text_too_weak": "Too weak",
-  "password_input_helper_text_weak": "Weak",
-  "password_input_helper_text_medium": "Medium",
-  "password_input_helper_text_strong": "Strong",
-  "password_input_helper_text_registration_failed": "Choose another password!",
-  "password_input_helper_text": "",
-  "password_rules_dialog_title": "Password rules",
-  "password_input_label": "Password",
-  "password_rule_one": "The password must contain at least 1 lowercase alphabetical character.",
-  "password_rule_two": "The password must contain at least 1 uppercase alphabetical character.",
-  "password_rule_three": "The password must contain at least 1 numeric character.",
-  "password_rule_four": "The password must contain at least 1 special character.",
-  "password_rule_five": "The password must be 10 characters or longer to be considered strong.",
-  "username_rule_one": "The username must be 3 to 32 characters long.",
-  "username_rule_two": "The username may contain lowercase and uppercase alphabetical characters.",
-  "username_rule_three": "The username may contain hyphens (-).",
-  "username_rule_four": "The username may contain underscores (_).",
-  "welcome_text": "Welcome to Jami!",
-  "message_member_invited": "{{user}} was invited to join",
-  "message_member_left": "{{user}} left",
-  "message_member_banned": "{{user}} was kicked",
-  "message_member_unbanned": "{{user}} was re-added",
-  "messages_scroll_to_end": "Scroll to end of conversation",
-  "conversation_add_contact_form": "Add a contact",
-  "message_input_placeholder_one": "Write to {{member0}}",
-  "message_input_placeholder_two": "Write to {{member0}} and {{member1}}",
-  "message_input_placeholder_three": "Write to {{member0}}, {{member1}} and {{member2}}",
-  "message_input_placeholder_four": "Write to {{member0}}, {{member1}}, {{member2}}, +1 other member",
-  "message_input_placeholder_more": "Write to {{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
-  "missed_incoming_call": "Missed incoming call from conversation {{conversationId}}",
-  "conversation_title_one": "{{member0}}",
-  "conversation_title_two": "{{member0}} and {{member1}}",
-  "conversation_title_three": "{{member0}}, {{member1}} and {{member2}}",
-  "conversation_title_four": "{{member0}}, {{member1}}, {{member2}}, +1 other member",
+  "conversation_title_1": "{{member0}}",
+  "conversation_title_2": "{{member0}} and {{member1}}",
+  "conversation_title_3": "{{member0}}, {{member1}} and {{member2}}",
+  "conversation_title_4": "{{member0}}, {{member1}}, {{member2}}, +1 other member",
   "conversation_title_more": "{{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
-  "conversation_add_contact": "Add contact",
-  "loading": "Loading...",
-  "calling": "Calling {{member0}}",
-  "connecting": "Connecting...",
+  "dialog_cancel": "Cancel",
+  "dialog_close": "Close",
+  "dialog_confirm_title_default": "Confirm action",
   "end_call": "End call",
-  "refuse_call": "Refuse",
-  "accept_call_audio": "Accept in audio",
-  "accept_call_video": "Accept in video",
-  "permission_denied_title": "You denied Jami access to the camera and microphone",
-  "permission_denied_details": "You need to give Jami permission to use the camera and microphone in order to make a call",
-  "settings_title_general": "General",
-  "settings_title_system": "System",
-  "setting_dark_theme": "Dark theme",
-  "setting_language": "Language",
-  "login_username_not_found": "Username not found",
-  "login_invalid_password": "Incorrect password",
-  "login_form_title": "Login",
-  "login_form_username_tooltip": "The username you registered with",
-  "login_form_password_tooltip": "The password you registered with",
-  "jami": "Jami",
-  "jams": "JAMS",
-  "login_form_submit_button": "Log in",
-  "login_form_to_registration_text": "Need an account?",
-  "login_form_to_registration_link": "Register",
-  "registration_success": "You've successfully registered! — Logging you in...",
-  "login_invalid_credentials": "Invalid credentials",
-  "registration_form_title": "Registration",
-  "registration_form_username_tooltip": "Username may be from 3 to 32 chraracters long and contain a-z, A-Z, -, _\n\nClick for more details",
-  "registration_form_password_tooltip": "Choose a password hard to guess for others but easy to remember for you, it must be at least 10 characters. Your account won't be recovered if you forget it!\n\nClick for more details",
-  "registration_form_submit_button": "Register",
-  "registration_form_to_login_text": "Already have an account?",
-  "registration_form_to_login_link": "Log in",
-  "setup_login_title": "Jami web node setup",
-  "setup_login_welcome": "Welcome to the Jami web node setup.",
-  "setup_login_admin_creation": "Let's start by creating a new administrator account to control access to the server configuration.",
-  "password_placeholder": "Password",
-  "setup_login_password_placeholder_creation": "New password",
-  "setup_login_password_placeholder_repeat": "Repeat password",
-  "admin_creation_submit_button": "Create admin account",
-  "conversation_block": "Block conversation",
-  "conversation_ask_confirm_block": "Would you really like to block this conversation?",
-  "conversation_confirm_block": "Block",
-  "share_screen": "Share your screen",
-  "share_window": "Share window",
-  "share_screen_area": "Share an area of your screen",
-  "share_file": "Share a file",
+  "incoming_call": "Incoming call",
   "incoming_call_audio": "Incoming audio call from {{member0}}",
   "incoming_call_video": "Incoming video call from {{member0}}",
+  "jami": "Jami",
+  "jams": "JAMS",
+  "loading": "Loading...",
+  "login_form_password_tooltip": "The password you registered with",
+  "login_form_submit_button": "Log in",
+  "login_form_title": "Login",
+  "login_form_to_registration_link": "Register",
+  "login_form_to_registration_text": "Need an account?",
+  "login_form_username_tooltip": "The username you registered with",
+  "login_invalid_credentials": "Invalid credentials",
+  "login_invalid_password": "Incorrect password",
+  "login_username_not_found": "Username not found",
+  "logout": "Log out",
+  "Menu": "Menu",
+  "message_call_incoming": "Incoming call - {{duration}}",
+  "message_call_incoming_missed": "Missed incoming call",
+  "message_call_outgoing": "Outgoing call - {{duration}}",
+  "message_call_outgoing_missed": "Missed outgoing call",
+  "message_input_placeholder_1": "Write to {{member0}}",
+  "message_input_placeholder_2": "Write to {{member0}} and {{member1}}",
+  "message_input_placeholder_3": "Write to {{member0}}, {{member1}} and {{member2}}",
+  "message_input_placeholder_4": "Write to {{member0}}, {{member1}}, {{member2}}, +1 other member",
+  "message_input_placeholder_more": "Write to {{member0}}, {{member1}}, {{member2}}, +{{excess}} other members",
+  "message_member_banned": "{{user}} was kicked",
+  "message_member_invited": "{{user}} was invited to join",
+  "message_member_joined": "{{user}} joined",
+  "message_member_left": "{{user}} left",
+  "message_member_unbanned": "{{user}} was re-added",
+  "message_swarm_created": "Swarm created",
+  "messages_scroll_to_end": "Scroll to end of conversation",
+  "missed_incoming_call": "Missed incoming call from conversation {{conversationId}}",
+  "ongoing_call_muted": "Ongoing call (muted)",
+  "ongoing_call_unmuted": "Ongoing call",
+  "outgoing_call": "Outgoing call",
+  "password_input_helper_text": "",
+  "password_input_helper_text_medium": "Medium",
+  "password_input_helper_text_registration_failed": "Choose another password!",
+  "password_input_helper_text_strong": "Strong",
+  "password_input_helper_text_too_weak": "Too weak",
+  "password_input_helper_text_weak": "Weak",
+  "password_input_label": "Password",
+  "password_placeholder": "Password",
+  "password_rule_1": "The password must contain at least 1 lowercase alphabetical character.",
+  "password_rule_2": "The password must contain at least 1 uppercase alphabetical character.",
+  "password_rule_3": "The password must contain at least 1 numeric character.",
+  "password_rule_4": "The password must contain at least 1 special character.",
+  "password_rule_5": "The password must be 10 characters or longer to be considered strong.",
+  "password_rules_dialog_title": "Password rules",
+  "permission_denied_details": "You need to give Jami permission to use the camera and microphone in order to make a call",
+  "permission_denied_title": "You denied Jami access to the camera and microphone",
+  "refuse_call": "Refuse",
+  "registration_form_password_tooltip": "Choose a password hard to guess for others but easy to remember for you, it must be at least 10 characters. Your account won't be recovered if you forget it!\n\nClick for more details",
+  "registration_form_submit_button": "Register",
+  "registration_form_title": "Registration",
+  "registration_form_to_login_link": "Log in",
+  "registration_form_to_login_text": "Already have an account?",
+  "registration_form_username_tooltip": "Username may be from 3 to 32 chraracters long and contain a-z, A-Z, -, _\n\nClick for more details",
+  "registration_success": "You've successfully registered! — Logging you in...",
+  "select_placeholder": "Select an option",
+  "setting_dark_theme": "Dark theme",
+  "setting_language": "Language",
+  "settings_account": "Account settings",
+  "settings_general": "General settings",
+  "settings_title_general": "General",
+  "settings_title_system": "System",
+  "setup_login_admin_creation": "Let's start by creating a new administrator account to control access to the server configuration.",
+  "setup_login_password_placeholder_creation": "New password",
+  "setup_login_password_placeholder_repeat": "Repeat password",
+  "setup_login_title": "Jami web node setup",
+  "setup_login_welcome": "Welcome to the Jami web node setup.",
+  "severity": "",
   "severity_error": "Error",
+  "severity_info": "Info",
   "severity_success": "Success",
-  "severity_info": "Info"
+  "share_file": "Share a file",
+  "share_screen": "Share your screen",
+  "share_screen_area": "Share an area of your screen",
+  "share_window": "Share window",
+  "username_input_helper_text": "",
+  "username_input_helper_text_invalid": "Username doesn't follow required pattern",
+  "username_input_helper_text_registration_failed": "Username not correct!",
+  "username_input_helper_text_success": "Username available",
+  "username_input_helper_text_taken": "Username already taken",
+  "username_input_label": "Choose an identifier",
+  "username_rule_1": "The username must be 3 to 32 characters long.",
+  "username_rule_2": "The username may contain lowercase and uppercase alphabetical characters.",
+  "username_rule_3": "The username may contain hyphens (-).",
+  "username_rule_4": "The username may contain underscores (_).",
+  "username_rules_dialog_title": "Username rules",
+  "welcome_text": "Welcome to Jami!"
 }