diff --git a/src/conversations/res/values-sv/strings.xml b/src/conversations/res/values-sv/strings.xml
new file mode 100644
index 000000000..9212ad109
--- /dev/null
+++ b/src/conversations/res/values-sv/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="use_conversations.im">Använd conversations.im</string>
+    <string name="create_new_account">Skapa nytt konto</string>
+    </resources>
\ No newline at end of file
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index f95042863..a654e7ca6 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -3,7 +3,10 @@
   <string name="action_settings">Inställningar</string>
   <string name="action_add">Ny konversation</string>
   <string name="action_accounts">Kontoinställningar</string>
+  <string name="action_end_conversation">Stäng denna konversation</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
+  <string name="action_muc_details">Gruppchattdetaljer</string>
+  <string name="channel_details">Kanaldetaljer</string>
   <string name="action_secure">Säker konversation</string>
   <string name="action_add_account">Lägg till konto</string>
   <string name="action_edit_contact">Ändra namn</string>
@@ -13,18 +16,25 @@
   <string name="action_unblock_contact">Avblockera kontakt</string>
   <string name="action_block_domain">Blockera domän</string>
   <string name="action_unblock_domain">Avblockera domän</string>
+  <string name="action_block_participant">Blockera deltagare</string>
+  <string name="action_unblock_participant">Avblockera deltagare</string>
   <string name="title_activity_manage_accounts">Hantera konton</string>
   <string name="title_activity_settings">Inställningar</string>
   <string name="title_activity_sharewith">Dela med konversation</string>
   <string name="title_activity_start_conversation">Starta konversation</string>
+  <string name="title_activity_choose_contact">Välj kontakt</string>
+  <string name="title_activity_choose_contacts">Välj kontakter</string>
+  <string name="title_activity_share_via_account">Dela via konto</string>
   <string name="title_activity_block_list">Blockeringslista</string>
   <string name="just_now">just nu</string>
   <string name="minute_ago">1 min sedan</string>
   <string name="minutes_ago">%d min sedan</string>
+  <string name="x_unread_conversations">%d olästa konversationer</string>
   <string name="sending">skickar…</string>
   <string name="message_decrypting">Avkrypterar meddelande. Vänta…</string>
   <string name="pgp_message">OpenPGP-krypterat meddelande</string>
   <string name="nick_in_use">Nick används redan</string>
+  <string name="invalid_muc_nick">Ogiltigt nick</string>
   <string name="admin">Admin</string>
   <string name="owner">Ägare</string>
   <string name="moderator">Moderator</string>
@@ -36,11 +46,16 @@
   <string name="block_domain_text">Blockera alla kontakter från %s?</string>
   <string name="unblock_domain_text">Avblockera alla kontakter från %s?</string>
   <string name="contact_blocked">Kontakt blockerad</string>
+  <string name="blocked">Blockerad</string>
   <string name="remove_bookmark_text">Vill du ta bort %s som bokmärke? Konversationer associerade med detta bokmärke kommer inte tas bort.</string>
   <string name="register_account">Registrera nytt konto på servern</string>
   <string name="change_password_on_server">Byt lösenord på server</string>
   <string name="share_with">Dela med…</string>
+  <string name="start_conversation">Börja konversation</string>
+  <string name="invite_contact">Bjud in kontakt</string>
+  <string name="invite">Bjud in</string>
   <string name="contacts">Kontakter</string>
+  <string name="contact">Kontakt</string>
   <string name="cancel">Avbryt</string>
   <string name="set">Sätt</string>
   <string name="add">Lägg till</string>
@@ -66,6 +81,9 @@
   <string name="sharing_files_please_wait">Delar filer. Vänta...</string>
   <string name="action_clear_history">Rensa historik</string>
   <string name="clear_conversation_history">Rensa konversationshistorik</string>
+  <string name="clear_histor_msg">Är du säker på att du vill ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte att ta bort kopior av dessa meddelanden på andra enheter eller servrar.</string>
+  <string name="delete_file_dialog">Ta bort fil</string>
+  <string name="also_end_conversation">Stäng denna konversation efteråt</string>
   <string name="choose_presence">Välj enhet</string>
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_message">Skicka meddelande</string>
@@ -106,8 +124,10 @@
   <string name="pref_confirm_messages">Bekräfta meddelanden</string>
   <string name="pref_confirm_messages_summary">Låt dina kontakter veta när du har mottagit och läst deras meddelanden</string>
   <string name="pref_ui_options">Gränssnitt</string>
+  <string name="bad_key_for_encryption">Dålig krypterings-nyckel.</string>
   <string name="accept">Acceptera</string>
   <string name="error">Ett fel har inträffat</string>
+  <string name="recording_error">Fel</string>
   <string name="your_account">Ditt konto</string>
   <string name="send_presence_updates">Skicka tillgänglighetsuppdatering</string>
   <string name="receive_presence_updates">Ta emot tillgänglighetsuppdateringar</string>
@@ -150,8 +170,11 @@
   <string name="mgmt_account_are_you_sure">Är du säker?</string>
   <string name="mgmt_account_delete_confirm_text">Om du tar bort ditt konto kommer hela konversationshistoriken att försvinna</string>
   <string name="attach_record_voice">Spela in röst</string>
+  <string name="account_settings_jabber_id">XMPP-adress</string>
+  <string name="block_jabber_id">Blockera XMPP-adress</string>
   <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
   <string name="password">Lösenord</string>
+  <string name="invalid_jid">Detta är inte en giltig XMPP-adress</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
   <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontakter?</string>
   <string name="server_info_show_more">Server-info</string>
@@ -186,8 +209,10 @@
   <string name="fetching_keys">Hämtar nycklar...</string>
   <string name="done">Klar</string>
   <string name="decrypt">Avkryptera</string>
+  <string name="bookmarks">Bokmärken</string>
   <string name="search">Sök</string>
   <string name="enter_contact">Fyll i kontakt</string>
+  <string name="delete_contact">Ta bort kontakt</string>
   <string name="view_contact_details">Se kontaktdetaljer</string>
   <string name="block_contact">Blockera kontakt</string>
   <string name="unblock_contact">Avblockera kontakt</string>
@@ -198,10 +223,13 @@
   <string name="save_as_bookmark">Spara som bokmärke</string>
   <string name="delete_bookmark">Ta bort bokmärke</string>
   <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
+  <string name="topic">Ämne</string>
+  <string name="joining_conference">Går med i gruppchatt...</string>
   <string name="leave">Lämna</string>
   <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
   <string name="add_back">Addera tillbaka</string>
   <string name="contact_has_read_up_to_this_point">%s har läst hit</string>
+  <string name="everyone_has_read_up_to_this_point">Alla har läst fram till hit</string>
   <string name="publish">Publicera</string>
   <string name="touch_to_choose_picture">Tryck på avatarbild för att välja en bild från bildgalleriet</string>
   <string name="publishing">Publicerar…</string>
@@ -220,6 +248,7 @@
   <string name="skip">Hoppa över</string>
   <string name="disable_notifications">Inaktivera notifieringar</string>
   <string name="enable">Aktivera</string>
+  <string name="conference_requires_password">Gruppchatten kräver lösenord</string>
   <string name="enter_password">Fyll i lösenord</string>
   <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
   <string name="request_now">Begär nu</string>
@@ -230,6 +259,7 @@
   <string name="pref_allow_message_correction_summary">Tillåt att dina kontakter kan ändra sina meddelanden i efterhand</string>
   <string name="pref_expert_options">Expertinställningar</string>
   <string name="pref_expert_options_summary">Var försiktig med dem</string>
+  <string name="title_activity_about_x">Om %s</string>
   <string name="title_pref_quiet_hours">Tysta timmar</string>
   <string name="title_pref_quiet_hours_start_time">Starttid</string>
   <string name="title_pref_quiet_hours_end_time">Sluttid</string>
@@ -240,7 +270,10 @@
   <string name="pref_use_indicate_received_summary">Mottagna meddelanden markeras med en grön bock om det stöds</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
   <string name="pref_expert_options_other">Annat</string>
+  <string name="pref_autojoin">Synkronisera med bokmärken</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-fingeravtryck har kopierats till urklipp!</string>
+  <string name="conference_resource_constraint">Resursbegränsning</string>
+  <string name="conference_shutdown">Gruppchatten stängdes ner</string>
   <string name="using_account">använder konto %s</string>
   <string name="checking_x">Kontrollerar %s på webbserver</string>
   <string name="not_connected_try_again">Du är inte ansluten. Försök igen senare</string>
@@ -248,9 +281,14 @@
   <string name="check_x_filesize_on_host">Kontrollera filstorlek för %1$s på %2$s</string>
   <string name="message_options">Meddelandealternativ</string>
   <string name="quote">Citera</string>
+  <string name="paste_as_quote">Klistra in som citat</string>
   <string name="copy_original_url">Kopiera orginal-URL</string>
   <string name="send_again">Skicka igen</string>
   <string name="file_url">Fil-URL</string>
+  <string name="url_copied_to_clipboard">Kopierade URL till urklipp</string>
+  <string name="jabber_id_copied_to_clipboard">Kopierade XMPP-adress till urklipp</string>
+  <string name="error_message_copied_to_clipboard">Kopierade felmeddelande till urklipp</string>
+  <string name="web_address">webbadress</string>
   <string name="scan_qr_code">Scanna 2D-streckkod</string>
   <string name="show_qr_code">Visa 2D-streckkod</string>
   <string name="show_block_list">Visa blockeringslista</string>
@@ -259,6 +297,14 @@
   <string name="try_again">Försök igen</string>
   <string name="pref_keep_foreground_service">Håll tjänst i förgrunden</string>
   <string name="pref_keep_foreground_service_summary">Förehindrar operativsystemet att ta ner uppkopplingen</string>
+  <string name="pref_create_backup">Skapa säkerhetskopia</string>
+  <string name="pref_create_backup_summary">Säkerhetskopians filer lagras i %s</string>
+  <string name="notification_create_backup_title">Skapar filer för säkerhetskopia</string>
+  <string name="notification_backup_created_title">Din säkerhetskopia har skapats</string>
+  <string name="notification_backup_created_subtitle">Säkerhetskopians filer har lagrats i %s</string>
+  <string name="restoring_backup">Återställer säkerhetskopia</string>
+  <string name="notification_restored_backup_title">Din säkerhetskopia har återställts</string>
+  <string name="notification_restored_backup_subtitle">Glöm inte att aktivera kontot.</string>
   <string name="choose_file">Välj fil</string>
   <string name="receiving_x_file">Tar emot %1$s (%2$d%% klart)</string>
   <string name="download_x_file">Ladda ner %s</string>
@@ -272,8 +318,11 @@
   <string name="file_transmission_failed">filöverföring lyckades inte</string>
   <string name="file_deleted">Filen har blivit borttagen</string>
   <string name="no_application_found_to_open_file">Ingen applikation kunde hittas för att öppna filen</string>
+  <string name="no_application_found_to_open_link">Ingen applikation kunde hittas för att öppna länken</string>
+  <string name="no_application_found_to_view_contact">Ingen applikation kunde hittas för att visa kontakten</string>
   <string name="pref_show_dynamic_tags_summary">Visa skrivskyddade taggar under kontakter</string>
   <string name="enable_notifications">Aktivera notifieringar</string>
+  <string name="conference_creation_failed">Misslyckades skapa gruppchatt!</string>
   <string name="account_image_description">Kontots avatarbild</string>
   <string name="copy_omemo_clipboard_description">Kopiera OMEMO-fingeravtryck till urklipp</string>
   <string name="regenerate_omemo_key">Regenerera OMEMO-nyckel</string>
@@ -298,6 +347,8 @@
   <string name="advanced_mode">Avancerat läge</string>
   <string name="grant_admin_privileges">Bevilja administratörsbehörighet</string>
   <string name="remove_admin_privileges">Återkalla administratörsbehörighet</string>
+  <string name="remove_from_room">Ta bort från gruppchatt</string>
+  <string name="remove_from_channel">Ta bort från kanal</string>
   <string name="could_not_change_affiliation">Kunde inte ändra tillhörigheten för %s</string>
   <string name="ban_now">Bannlys nu</string>
   <string name="could_not_change_role">Kunde inte ändra rollen för %s</string>
@@ -349,6 +400,7 @@
   <string name="recently_used">Senast använd</string>
   <string name="choose_quick_action">Välj snabbfunktion</string>
   <string name="send_private_message">Skicka privat meddelande</string>
+  <string name="user_has_left_conference">%1$s har lämnat gruppchatten!</string>
   <string name="username">Användarnamn</string>
   <string name="username_hint">Användarnamn</string>
   <string name="invalid_username">Inte ett giltigt användanamn</string>
@@ -360,8 +412,10 @@
   <string name="account_status_bind_failure">Bind-fel</string>
   <string name="account_status_host_unknown">Servern är inte ansvarig för domänen</string>
   <string name="server_info_broken">Sönder</string>
+  <string name="pref_presence_settings">Tillgänglighet</string>
   <string name="pref_away_when_screen_off">Status borta när skärmen är av</string>
   <string name="pref_away_when_screen_off_summary">Sätter din tillgänglighet till borta när skrämen är av</string>
+  <string name="pref_dnd_on_silent_mode">\"Stör ej\" i tyst läge</string>
   <string name="pref_treat_vibrate_as_silent">Hantera vibrationsläge som tyst läge</string>
   <string name="pref_show_connection_options">Utökade anslutningsinställningar</string>
   <string name="pref_show_connection_options_summary">Visa val av servernamn och port vid inställning av konto</string>
@@ -398,10 +452,14 @@
   <string name="shared_image_with_x">Delade bild med %s</string>
   <string name="shared_images_with_x">Delade bilder med %s</string>
   <string name="shared_text_with_x">Delade text med %s</string>
+  <string name="no_storage_permission">Conversations behöver tillgång till extern lagring</string>
+  <string name="no_camera_permission">Conversations behöver tillgång till kameran</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
+  <string name="pref_picture_compression">Bildkomprimering</string>
+  <string name="pref_picture_compression_summary">Ändra storlek på och komprimera bilder</string>
   <string name="always">Alltid</string>
   <string name="automatically">Automatiskt</string>
   <string name="battery_optimizations_enabled">Batterioptimeringar aktiverade</string>
@@ -417,6 +475,8 @@
   <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string>
   <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string>
   <string name="share_uri_with">Dela URI med...</string>
+  <string name="agree_and_continue">Godkänn &amp; fortsätt</string>
+  <string name="your_full_jid_will_be">Din fullständiga XMPP-adress kommer att vara: %s</string>
   <string name="create_account">Skapa konto</string>
   <string name="use_own_provider">Använd min egen leverantör</string>
   <string name="pick_your_username">Välj användarnamn</string>
@@ -431,6 +491,7 @@
   <string name="registration_please_wait">Registreringfel: Försök igen senare</string>
   <string name="registration_password_too_weak">Registreringsfel: Lösenordet är för svagt</string>
   <string name="choose_participants">Välj deltagare</string>
+  <string name="creating_conference">Skapar gruppchatt...</string>
   <string name="invite_again">Bjud in igen</string>
   <string name="gp_short">Kort</string>
   <string name="gp_medium">Medium</string>
@@ -494,10 +555,35 @@
   <string name="verify_omemo_keys">Verifiera OMEMO-nycklar</string>
   <string name="distrust_omemo_key">Lita ej på enhet</string>
   <string name="distrust_omemo_key_text">Är du säker på att du vill ta bort verifieringen av denna enhet?\nDenna enhet och meddelanden som kommer från enheten kommer att markeras som ej pålitliga.</string>
+  <plurals name="seconds">
+    <item quantity="one">%d sekund</item>
+    <item quantity="other">%d sekunder</item>
+  </plurals>
+  <plurals name="minutes">
+    <item quantity="one">%d minut</item>
+    <item quantity="other">%d minuter</item>
+  </plurals>
+  <plurals name="hours">
+    <item quantity="one">%d timme</item>
+    <item quantity="other">%d timmar</item>
+  </plurals>
+  <plurals name="days">
+    <item quantity="one">%d dag</item>
+    <item quantity="other">%d dagar</item>
+  </plurals>
+  <plurals name="weeks">
+    <item quantity="one">%d vecka</item>
+    <item quantity="other">%d veckor</item>
+  </plurals>
+  <plurals name="months">
+    <item quantity="one">%d månad</item>
+    <item quantity="other">%d månader</item>
+  </plurals>
   <string name="pref_automatically_delete_messages">Automatisk borttagning av meddelanden</string>
   <string name="pref_automatically_delete_messages_description">Ta automatiskt bort meddelanden från denna enhet som är äldre än den konfigurerade tidsramen.</string>
   <string name="encrypting_message">Krypterar meddelande</string>
   <string name="not_fetching_history_retention_period">Hämtar inte meddelanden på grund av inställningen för borttagning av gamla meddelanden.</string>
+  <string name="transcoding_video">Komprimerar video</string>
   <string name="corresponding_conversations_closed">Motsvarande konversationer är stängda.</string>
   <string name="contact_blocked_past_tense">Kontakt blockerad.</string>
   <string name="pref_notifications_from_strangers">Notifieringar från främlingar</string>
@@ -508,4 +594,29 @@
   <string name="online_right_now">online just nu</string>
   <string name="retry_decryption">Försök dekryptera igen</string>
   <string name="session_failure">Sessionsfel</string>
+  <string name="today">Idag</string>
+  <string name="yesterday">Igår</string>
+  <string name="certificate_does_not_contain_jid">Certifikatet innehåller ej en XMPP-adress</string>
+  <string name="attach_record_video">Spela in video</string>
+  <string name="message">Meddelande</string>
+  <string name="mtm_accept_cert">Godkänn okänt certifikat?</string>
+  <string name="draft">Utkast:</string>
+  <string name="title_activity_share_location">Dela plats</string>
+  <string name="title_activity_show_location">Visa plats</string>
+  <string name="share">Dela</string>
+  <string name="copy_jabber_id">Kopiera XMPP-adress</string>
+  <string name="create_dialog_group_chat_name">Gruppchattens namn</string>
+  <string name="group_chat_members">Deltagare</string>
+  <string name="choose_a_country">Välj ett land</string>
+  <string name="phone_number">telefonnummer</string>
+  <string name="verify_your_phone_number">Bekräfta ditt telefonnummer</string>
+  <string name="create_group_chat">Skapa gruppchatt</string>
+  <string name="create_private_group_chat">Skapa sluten gruppchatt</string>
+  <string name="create_dialog_channel_name">Kanalnamn</string>
+  <string name="please_enter_name">Vänligen ange ett namn på kanalen</string>
+  <string name="channel_already_exists">Denna kanal finns redan</string>
+  <string name="joined_an_existing_channel">Du har gått med i en befintlig kanal</string>
+  <string name="no_users_hint_group_chat">Denna slutna gruppchatt har inga deltagare.</string>
+  <string name="discover_channels">Upptäck kanaler</string>
+  <string name="this_looks_like_channel">Detta ser ut som en kanaladress</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 889088d43..a66d2fd0e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,33 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="action_settings">设置</string>
-  <string name="action_add">新会话</string>
+  <string name="action_add">新聊天</string>
   <string name="action_accounts">管理账户</string>
   <string name="action_account">管理账户</string>
-  <string name="action_end_conversation">关闭对话</string>
+  <string name="action_end_conversation">关闭聊天</string>
   <string name="action_contact_details">联系人详情</string>
   <string name="action_muc_details">群聊详情</string>
   <string name="channel_details">频道详情</string>
-  <string name="action_secure">安全对话</string>
+  <string name="action_secure">安全聊天</string>
   <string name="action_add_account">添加账号</string>
   <string name="action_edit_contact">编辑姓名</string>
-  <string name="action_add_phone_book">添加到地址薄</string>
-  <string name="action_delete_contact">从列表中删除</string>
-  <string name="action_block_contact">屏蔽联系人</string>
-  <string name="action_unblock_contact">解除联系人屏蔽</string>
-  <string name="action_block_domain">屏蔽域名</string>
-  <string name="action_unblock_domain">解除域名屏蔽</string>
+  <string name="action_add_phone_book">添加到联系人</string>
+  <string name="action_delete_contact">从XMPP联系人中删除</string>
+  <string name="action_block_contact">封禁联系人</string>
+  <string name="action_unblock_contact">解封联系人</string>
+  <string name="action_block_domain">封禁域名</string>
+  <string name="action_unblock_domain">解封域名</string>
+  <string name="action_block_participant">封禁成员</string>
+  <string name="action_unblock_participant">解封成员</string>
   <string name="title_activity_manage_accounts">管理账户</string>
   <string name="title_activity_settings">设置</string>
-  <string name="title_activity_sharewith">分享会话</string>
-  <string name="title_activity_start_conversation">开始会话</string>
+  <string name="title_activity_sharewith">通过Conversations分享</string>
+  <string name="title_activity_start_conversation">开始聊天</string>
   <string name="title_activity_choose_contact">选择联系人</string>
   <string name="title_activity_choose_contacts">选择联系人</string>
   <string name="title_activity_share_via_account">通过帐户分享</string>
-  <string name="title_activity_block_list">屏蔽列表</string>
+  <string name="title_activity_block_list">封禁列表</string>
   <string name="just_now">刚刚</string>
   <string name="minute_ago">1分钟前</string>
   <string name="minutes_ago">%d分钟前</string>
+  <string name="x_unread_conversations">%d条未读消息</string>
   <string name="sending">正在发送…</string>
   <string name="message_decrypting">解密信息中. 请稍候…</string>
   <string name="pgp_message">OpenPGP 加密的信息</string>
@@ -35,19 +38,19 @@
   <string name="invalid_muc_nick">无效的用户名</string>
   <string name="admin">管理员</string>
   <string name="owner">所有者</string>
-  <string name="moderator">群主</string>
+  <string name="moderator">版主</string>
   <string name="participant">参与者</string>
   <string name="visitor">访客</string>
-  <string name="remove_contact_text">将 %s 从列表中移除? 与该联系人的会话消息不会清除.</string>
-  <string name="block_contact_text">您想阻止%s向您发送消息吗？</string>
-  <string name="unblock_contact_text">你想解除对 %s 的屏蔽吗，他们将可以发送信息给你？</string>
-  <string name="block_domain_text">屏蔽 %s 中的所有联系人？</string>
-  <string name="unblock_domain_text">解除对 %s 中所有联系人的屏蔽？</string>
-  <string name="contact_blocked">联系人已屏蔽</string>
+  <string name="remove_contact_text">将 %s 从XMPP联系人中移除? 与该联系人的会话消息不会清除.</string>
+  <string name="block_contact_text">您想封禁%s吗？</string>
+  <string name="unblock_contact_text">您想解封 %s吗 ？</string>
+  <string name="block_domain_text">封禁 %s 中的所有联系人？</string>
+  <string name="unblock_domain_text">解封%s 中所有联系人？</string>
+  <string name="contact_blocked">联系人已封禁</string>
   <string name="blocked">已屏蔽</string>
   <string name="remove_bookmark_text">从书签中移除 %s ？相关会话消息不会被清除 .</string>
   <string name="register_account">在服务器上注册新账户</string>
-  <string name="change_password_on_server">在服务器上改变密码</string>
+  <string name="change_password_on_server">在服务器上修改密码</string>
   <string name="share_with">分享……</string>
   <string name="start_conversation">开始会话</string>
   <string name="invite_contact">邀请联系人</string>
@@ -379,9 +382,14 @@
   <string name="could_not_change_affiliation">不能修改 %s 的从属关系</string>
   <string name="ban_from_conference">屏蔽群聊</string>
   <string name="ban_from_channel">从频道中屏蔽</string>
+  <string name="removing_from_public_conference">%s将被从公共群聊中移除。只有将此用户封禁才能将他从群聊永远移除。</string>
   <string name="ban_now">现在屏蔽</string>
   <string name="could_not_change_role">不能修改 %s 的角色</string>
+  <string name="conference_options">私密群聊设置</string>
+  <string name="channel_options">公开群聊设置</string>
   <string name="members_only">私密，只有成员可以加入</string>
+  <string name="non_anonymous">使XMPP地址对所有人可见</string>
+  <string name="moderated">使群聊受到管理</string>
   <string name="you_are_not_participating">您尚未参与</string>
   <string name="modified_conference_options">群组设置修改成功!</string>
   <string name="could_not_modify_conference_options">无法更改群组设置</string>
@@ -416,6 +424,8 @@
   <string name="no_application_found_to_display_location">无法找到显示位置的应用</string>
   <string name="location">位置</string>
   <string name="title_undo_swipe_out_conversation">会话已关闭</string>
+  <string name="title_undo_swipe_out_group_chat">离开私密群聊</string>
+  <string name="title_undo_swipe_out_channel">离开公开群聊</string>
   <string name="pref_dont_trust_system_cas_title">不相信系统 CA</string>
   <string name="pref_dont_trust_system_cas_summary">所有证书必须人工通过</string>
   <string name="pref_remove_trusted_certificates_title">移除证书</string>
@@ -433,6 +443,7 @@
   <string name="recently_used">最近常用</string>
   <string name="choose_quick_action">选择快捷操作</string>
   <string name="search_contacts">搜索联系人</string>
+  <string name="search_bookmarks">搜索书签</string>
   <string name="send_private_message">发送私密消息</string>
   <string name="user_has_left_conference">%1$s 离开了群聊！</string>
   <string name="username">用户名</string>
@@ -466,6 +477,7 @@
   <string name="captcha_required">需要验证码</string>
   <string name="captcha_hint">输入上图中的文字</string>
   <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
+  <string name="jid_does_not_match_certificate">XMPP地址与证书不匹配</string>
   <string name="action_renew_certificate">更新证书</string>
   <string name="error_fetching_omemo_key">获取 OMEMO 密钥错误！</string>
   <string name="verified_omemo_key_with_certificate">请用证书验证 OMEMO 密钥！</string>
@@ -490,6 +502,7 @@
   <string name="no_storage_permission">Conversations 需要外部储存权限</string>
   <string name="no_camera_permission">Conversations 需要摄像头权限</string>
   <string name="sync_with_contacts">同步联系人</string>
+  <string name="sync_with_contacts_long">将服务器端联系人与本地联系人匹配可以显示联系人的全名与头像。\n\n此应用只在本地读取并匹配联系人。\n\n现在应用将请求联系人权限。</string>
   <string name="notify_on_all_messages">为所有信息显示通知</string>
   <string name="notify_only_when_highlighted">只在被提到时通知</string>
   <string name="notify_never">禁用通知</string>
@@ -514,6 +527,9 @@
   <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string>
   <string name="no_application_to_share_uri">未找到可以分享此链接的应用</string>
   <string name="share_uri_with">分享链接……</string>
+  <string name="agree_and_continue">同意 &amp; 继续</string>
+  <string name="magic_create_text">此向导将为您在conversations.im¹上创建一个账户。\n您的联系人可以通过您的XMPP完整地址与您聊天。</string>
+  <string name="your_full_jid_will_be">您的XMPP完整地址将是：%s</string>
   <string name="create_account">创建账户</string>
   <string name="use_own_provider">使用我自己的服务端</string>
   <string name="pick_your_username">输入您的用户名</string>
@@ -641,6 +657,7 @@
   <string name="yesterday">昨天</string>
   <string name="pref_validate_hostname">使用 DNSSEC 来验证主机名</string>
   <string name="pref_validate_hostname_summary">包含已验证的主机名的服务器证书被认为是已验证的</string>
+  <string name="certificate_does_not_contain_jid">证书不包含XMPP地址</string>
   <string name="server_info_partial">部分的</string>
   <string name="attach_record_video">录制视频</string>
   <string name="copy_to_clipboard">复制</string>
@@ -682,6 +699,7 @@
   <string name="medium">中</string>
   <string name="large">大</string>
   <string name="not_encrypted_for_this_device">该设备的消息未加密。</string>
+  <string name="omemo_decryption_failed">解密OMEMO消息失败</string>
   <string name="undo">撤销</string>
   <string name="location_disabled">位置分享已停用</string>
   <string name="action_fix_to_location">固定位置</string>
@@ -699,7 +717,9 @@
   <string name="gif">GIF</string>
   <string name="view_conversation">查看对话</string>
   <string name="pref_use_share_location_plugin">分享位置插件</string>
+  <string name="pref_use_share_location_plugin_summary">不使用内置地图，使用“分享位置”插件</string>
   <string name="copy_link">复制web地址</string>
+  <string name="copy_jabber_id">复制XMPP地址</string>
   <string name="p1_s3_filetransfer">用于S3的HTTP文件共享</string>
   <string name="pref_start_search">直接搜索</string>
   <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索栏中</string>
@@ -726,6 +746,8 @@
   <string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
   <string name="video_compression_channel_name">视频压缩</string>
   <string name="view_media">查看媒体文件</string>
+  <string name="view_users">查看成员</string>
+  <string name="group_chat_members">成员</string>
   <string name="media_browser">媒体浏览器</string>
   <string name="security_violation_not_attaching_file">文件由于违反安全策略而被删除。</string>
   <string name="pref_video_compression">视频质量</string>
@@ -734,4 +756,113 @@
   <string name="video_720p">高（720p）</string>
   <string name="cancelled">已取消</string>
   <string name="already_drafting_message">你已经在起草一条消息了。</string>
+  <string name="feature_not_implemented">功能不支持。</string>
+  <string name="invalid_country_code">无效国家代码</string>
+  <string name="choose_a_country">选择国家</string>
+  <string name="phone_number">手机号</string>
+  <string name="verify_your_phone_number">验证手机号</string>
+  <string name="enter_country_code_and_phone_number">Quicksy将发送验证码短信（运营商可能收费）。请输入国家代码和手机号：</string>
+  <string name="we_will_be_verifying"><![CDATA[我们将验证<br/><br/><b>%s</b><br/><br/>。电话号码正确吗？]]></string>
+  <string name="not_a_valid_phone_number">%s不是有效的电话号码</string>
+  <string name="please_enter_your_phone_number">请输入手机号。</string>
+  <string name="search_countries">搜索国家</string>
+  <string name="verify_x">验证%s</string>
+  <string name="we_have_sent_you_an_sms_to_x"><![CDATA[短信已发至 <b>%s</b>。]]></string>
+  <string name="we_have_sent_you_another_sms">已重新发送6位数验证码短信</string>
+  <string name="please_enter_pin_below">输入6位数的PIN</string>
+  <string name="resend_sms">重新发送短信</string>
+  <string name="resend_sms_in">重发短信（%s）</string>
+  <string name="wait_x">请稍候（%s）</string>
+  <string name="back">返回</string>
+  <string name="possible_pin">已自动从剪贴板粘贴验证码</string>
+  <string name="please_enter_pin">请输入6位代码</string>
+  <string name="abort_registration_procedure">确定放弃注册？</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
+  <string name="verifying">正在验证......</string>
+  <string name="requesting_sms">请求短信...</string>
+  <string name="incorrect_pin">验证码错误。</string>
+  <string name="pin_expired">验证码已失效</string>
+  <string name="unknown_api_error_network">未知网络错误</string>
+  <string name="unknown_api_error_response">未知服务器应答</string>
+  <string name="unable_to_connect_to_server">无法连接服务器。</string>
+  <string name="unable_to_establish_secure_connection">无法建立安全连接。</string>
+  <string name="unable_to_find_server">找不到服务器</string>
+  <string name="something_went_wrong_processing_your_request">处理请求时出错</string>
+  <string name="invalid_user_input">用户输入无效</string>
+  <string name="temporarily_unavailable">暂时无法连接。请稍候再试。</string>
+  <string name="no_network_connection">无网络连接</string>
+  <string name="try_again_in_x">请在%s后重试</string>
+  <string name="rate_limited">频率过高</string>
+  <string name="too_many_attempts">尝试次数过多</string>
+  <string name="the_app_is_out_of_date">您正在使用旧版应用。</string>
+  <string name="update">更新</string>
+  <string name="logged_in_with_another_device">此号码已在其他设备上登录。</string>
+  <string name="enter_your_name_instructions">请输入您的姓名。这样，对方就能知道您是谁。</string>
+  <string name="your_name">您的姓名</string>
+  <string name="enter_your_name">输入姓名</string>
+  <string name="no_name_set_instructions">点击编辑按钮以编辑用户名。</string>
+  <string name="reject_request">拒绝请求</string>
+  <string name="install_orbot">安装Orbot</string>
+  <string name="start_orbot">启动Orbot</string>
+  <string name="no_market_app_installed">软件商店未安装</string>
+  <string name="group_chat_will_make_your_jabber_id_public">此群聊将公开你的XMPP地址</string>
+  <string name="ebook">电子书</string>
+  <string name="video_original">原始（未压缩）</string>
+  <string name="open_with">打开方式</string>
+  <string name="set_profile_picture">聊天头像</string>
+  <string name="choose_account">选择账户</string>
+  <string name="restore_backup">恢复备份</string>
+  <string name="restore">恢复</string>
+  <string name="enter_password_to_restore">输入%s的密码以恢复备份</string>
+  <string name="restore_warning">仅在迁移或丢失原设备时恢复备份。</string>
+  <string name="unable_to_restore_backup">无法恢复备份。</string>
+  <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
+  <string name="backup_channel_name">备份与恢复</string>
+  <string name="enter_jabber_id">输入XMPP地址</string>
+  <string name="create_group_chat">创建群聊</string>
+  <string name="join_public_channel">加入公开群聊</string>
+  <string name="create_private_group_chat">创建私密群聊</string>
+  <string name="create_public_channel">创建公开群聊</string>
+  <string name="create_dialog_channel_name">群聊名称</string>
+  <string name="xmpp_address">XMPP地址</string>
+  <string name="please_enter_name">请为群聊提供一个名称。</string>
+  <string name="please_enter_xmpp_address">请提供XMPP地址。</string>
+  <string name="this_is_an_xmpp_address">这是一个XMPP地址。请提供一个名称。</string>
+  <string name="creating_channel">创建公开群聊</string>
+  <string name="channel_already_exists">群聊已存在</string>
+  <string name="joined_an_existing_channel">您加入了一个已经存在的群聊</string>
+  <string name="unable_to_set_channel_configuration">无法配置群聊</string>
+  <string name="allow_participants_to_edit_subject">允许任何成员修改主题</string>
+  <string name="allow_participants_to_invite_others">允许任何成员邀请其他人</string>
+  <string name="anyone_can_edit_subject">允许任何成员修改主题</string>
+  <string name="owners_can_edit_subject">拥有者可修改话题</string>
+  <string name="admins_can_edit_subject">管理员可修改主题</string>
+  <string name="owners_can_invite_others">所有者可以邀请其他人</string>
+  <string name="anyone_can_invite_others">允许任何成员邀请其他人</string>
+  <string name="jabber_ids_are_visible_to_admins">XMPP地址对管理员可见。</string>
+  <string name="jabber_ids_are_visible_to_anyone">XMPP地址对所有人可见</string>
+  <string name="no_users_hint_channel">此公开群聊无成员。邀请成员或使用分享按钮分享地址。</string>
+  <string name="no_users_hint_group_chat">此私密群聊无成员</string>
+  <string name="manage_permission">管理权限</string>
+  <string name="search_participants">搜索成员</string>
+  <string name="file_too_large">文件过大</string>
+  <string name="attach">附加</string>
+  <string name="discover_channels">发现群聊</string>
+  <string name="search_channels">搜索群聊</string>
+  <string name="channel_discovery_opt_in_title">可能侵犯隐私！</string>
+  <string name="i_already_have_an_account">我已有账户</string>
+  <string name="add_existing_account">添加已有账户</string>
+  <string name="register_new_account">注册新账户</string>
+  <string name="this_looks_like_a_domain">这好像是一个域名地址</string>
+  <string name="add_anway">仍然添加</string>
+  <string name="this_looks_like_channel">这好像是一个群聊地址</string>
+  <string name="share_backup_files">分享备份文件</string>
+  <string name="conversations_backup">备份文件</string>
+  <string name="event">事件</string>
+  <string name="open_backup">打开备份</string>
+  <string name="not_a_backup_file">选择的文件不是备份文件</string>
+  <string name="account_already_setup">账户已设置</string>
+  <string name="please_enter_password">请输入此账户的密码</string>
+  <string name="unable_to_perform_this_action">无法执行此操作</string>
 </resources>
diff --git a/src/quicksy/res/values-sv/strings.xml b/src/quicksy/res/values-sv/strings.xml
new file mode 100644
index 000000000..5c534245e
--- /dev/null
+++ b/src/quicksy/res/values-sv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="crash_report_title">Quicksy har kraschat</string>
+    <string name="no_camera_permission">Quicksy behöver tillgång till kameran</string>
+    <string name="pref_broadcast_last_activity_summary">Berätta för alla dina kontakter när du använder Quicksy</string>
+    <string name="no_microphone_permission">Quicksy behöver tillgång till mikrofonen</string>
+    <string name="not_available_in_your_country">Quicksy är inte tillgängligt i ditt land.</string>
+    <string name="unknown_security_error">Okänt säkerhetsfel.</string>
+    </resources>
diff --git a/src/quicksy/res/values-zh-rCN/strings.xml b/src/quicksy/res/values-zh-rCN/strings.xml
index b2830539d..f1a4091ef 100644
--- a/src/quicksy/res/values-zh-rCN/strings.xml
+++ b/src/quicksy/res/values-zh-rCN/strings.xml
@@ -19,4 +19,8 @@
     <string name="no_microphone_permission">Quicksy需要麦克风权限</string>
     <string name="foreground_service_channel_description">此通知类别用于显示表明Quicksy正在运行的永久通知。</string>
     <string name="set_profile_picture">Quicksy个人资料图片</string>
-    </resources>
+    <string name="not_available_in_your_country">Quicksy在您的国家无服务。</string>
+    <string name="unable_to_verify_server_identity">无法确认服务器身份</string>
+    <string name="unknown_security_error">未知安全错误</string>
+    <string name="timeout_while_connecting_to_server">服务器已超时</string>
+</resources>