diff --git a/src/conversations/res/values-ca/strings.xml b/src/conversations/res/values-ca/strings.xml
new file mode 100644
index 000000000..71a32bc6b
--- /dev/null
+++ b/src/conversations/res/values-ca/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pick_a_server">Triï el seu proveïdor de XMPP
+</string>
+    </resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 0cfeb7929..d0a2e340d 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -7,7 +7,7 @@
   <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="channel_details">群聊详情</string>
   <string name="action_secure">安全聊天</string>
   <string name="action_add_account">添加账号</string>
   <string name="action_edit_contact">编辑姓名</string>
@@ -31,10 +31,10 @@
   <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>
-  <string name="nick_in_use">该名称已存在</string>
+  <string name="sending">发送中…</string>
+  <string name="message_decrypting">解密中. 请稍候…</string>
+  <string name="pgp_message">OpenPGP加密的信息</string>
+  <string name="nick_in_use">该用户名已存在</string>
   <string name="invalid_muc_nick">无效的用户名</string>
   <string name="admin">管理员</string>
   <string name="owner">所有者</string>
@@ -47,11 +47,11 @@
   <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="blocked">已封禁</string>
   <string name="remove_bookmark_text">从书签中移除 %s ？相关会话消息不会被清除 .</string>
   <string name="register_account">在服务器上注册新账户</string>
   <string name="change_password_on_server">在服务器上修改密码</string>
-  <string name="share_with">分享……</string>
+  <string name="share_with">分享…</string>
   <string name="start_conversation">开始会话</string>
   <string name="invite_contact">邀请联系人</string>
   <string name="invite">邀请</string>
@@ -62,8 +62,8 @@
   <string name="add">添加</string>
   <string name="edit">编辑</string>
   <string name="delete">删除</string>
-  <string name="block">屏蔽</string>
-  <string name="unblock">解除屏蔽</string>
+  <string name="block">封禁</string>
+  <string name="unblock">解封</string>
   <string name="save">保存</string>
   <string name="ok">完成</string>
   <string name="crash_report_title">畅聊已崩溃</string>
@@ -73,7 +73,7 @@
   <string name="problem_connecting_to_account">无法连接至账户</string>
   <string name="problem_connecting_to_accounts">无法连接至多个账户</string>
   <string name="touch_to_fix">点击此处管理账户</string>
-  <string name="attach_file">附加文件</string>
+  <string name="attach_file">添加文件</string>
   <string name="not_in_roster">该联系人不在您的列表，需要加为联系人吗 ?</string>
   <string name="add_contact">添加联系人</string>
   <string name="send_failed">传递失败</string>
@@ -109,13 +109,17 @@
   <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，畅聊未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
   <string name="pref_general">常规</string>
   <string name="pref_accept_files">接收文件</string>
-  <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
+  <string name="pref_accept_files_summary">自动接收小于此大小的文件</string>
   <string name="pref_attachments">附件</string>
   <string name="pref_notification_settings">通知</string>
   <string name="pref_vibrate">震动</string>
   <string name="pref_vibrate_summary">收到新消息时震动</string>
   <string name="pref_led">LED 灯提示</string>
   <string name="pref_led_summary">收到新消息时闪烁通知灯</string>
+  <string name="pref_ringtone">铃声</string>
+  <string name="pref_notification_sound">通知铃声</string>
+  <string name="pref_notification_sound_summary">新消息通知铃声</string>
+  <string name="pref_call_ringtone_summary">来电铃声</string>
   <string name="pref_notification_grace_period">静默期限</string>
   <string name="pref_notification_grace_period_summary">在您的其他设备之一上检测到活动之后，时间通知的长度将被静音。</string>
   <string name="pref_advanced_options">高级</string>
@@ -134,7 +138,7 @@
   <string name="receive_presence_updates">接收在线联系人列表更新</string>
   <string name="ask_for_presence_updates">请求在线联系人列表更新</string>
   <string name="attach_choose_picture">选择图片</string>
-  <string name="attach_take_picture">照相</string>
+  <string name="attach_take_picture">拍摄图片</string>
   <string name="preemptively_grant">预先同意订阅请求</string>
   <string name="error_not_an_image_file">您选择的文件不是图像文件</string>
   <string name="error_compressing_image">转换图像出错</string>
@@ -188,6 +192,7 @@
   <string name="server_info_blocking">XEP-0191：屏蔽指令</string>
   <string name="server_info_roster_version">XEP-0237：名单版本</string>
   <string name="server_info_stream_management">XEP-0198：流管理</string>
+  <string name="server_info_external_service_discovery">XEP-0215：发现外部服务</string>
   <string name="server_info_pep">XEP-0163：PEP（头像/OMEMO）</string>
   <string name="server_info_http_upload">XEP-0363：HTTP文件上传</string>
   <string name="server_info_push">XEP-0357：推送</string>
@@ -229,23 +234,23 @@
   <string name="save_as_bookmark">保存为书签</string>
   <string name="delete_bookmark">删除书签</string>
   <string name="destroy_room">解散群聊</string>
-  <string name="destroy_channel">解散频道</string>
+  <string name="destroy_channel">解散群聊</string>
   <string name="destroy_room_dialog">您确定要解散此群聊吗？\n\n<b>警告：</b>此群聊将在服务器上完全删除。</string>
-  <string name="destroy_channel_dialog">您确定要解散此公共频道吗？\n\n<b>警告：</b>该频道将在服务器上完全删除。</string>
+  <string name="destroy_channel_dialog">您确定要解散此公共群聊吗？\n\n<b>警告：</b>该群聊将在服务器上完全删除。</string>
   <string name="could_not_destroy_room">无法解散群聊</string>
-  <string name="could_not_destroy_channel">无法解散频道</string>
+  <string name="could_not_destroy_channel">无法解散群聊</string>
   <string name="action_edit_subject">编辑群聊主题</string>
   <string name="topic">主题</string>
   <string name="joining_conference">正在加入群聊…</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
-  <string name="contact_has_read_up_to_this_point">%s 已读此句</string>
-  <string name="contacts_have_read_up_to_this_point">%s 已读此句</string>
-  <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d 都已读此句</string>
-  <string name="everyone_has_read_up_to_this_point">全部已读此句</string>
+  <string name="contact_has_read_up_to_this_point">%s 读到这里了</string>
+  <string name="contacts_have_read_up_to_this_point">%s 读到这里了</string>
+  <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s 和另外%2$d人读到这里了</string>
+  <string name="everyone_has_read_up_to_this_point">所有人都读到这里了</string>
   <string name="publish">发布</string>
-  <string name="touch_to_choose_picture">点击头像可从相册中选择头像 </string>
+  <string name="touch_to_choose_picture">点击头像以选择图片</string>
   <string name="publishing">正在发布…</string>
   <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布请求</string>
   <string name="error_publish_avatar_converting">转换头像图片出错</string>
@@ -283,7 +288,7 @@
   <string name="pref_autojoin">同步书签</string>
   <string name="pref_autojoin_summary">根据书签中的自动加入标记加入并离开群聊。</string>
   <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
-  <string name="conference_banned">你已经被禁言了</string>
+  <string name="conference_banned">你已经被封禁了</string>
   <string name="conference_members_only">这个群组只允许群组成员聊天</string>
   <string name="conference_resource_constraint">资源限制</string>
   <string name="conference_kicked">您已被移出该群组了</string>
@@ -374,10 +379,10 @@
   <string name="grant_owner_privileges">授予所有者权限</string>
   <string name="remove_owner_privileges">撤销所有者权限</string>
   <string name="remove_from_room">从群聊中移除</string>
-  <string name="remove_from_channel">从频道中移除</string>
+  <string name="remove_from_channel">从群聊中移除</string>
   <string name="could_not_change_affiliation">不能修改 %s 的从属关系</string>
   <string name="ban_from_conference">屏蔽群聊</string>
-  <string name="ban_from_channel">从频道中屏蔽</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>
@@ -465,7 +470,7 @@
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">使用证书添加账户</string>
   <string name="unable_to_parse_certificate">无法解析证书</string>
-  <string name="authenticate_with_certificate">留空以认证 w/ 证书</string>
+  <string name="authenticate_with_certificate">留空以使用证书认证</string>
   <string name="mam_prefs">压缩设置</string>
   <string name="server_side_mam_prefs">服务端压缩设置</string>
   <string name="fetching_mam_prefs">正在获取压缩设置。请稍候……</string>
@@ -483,7 +488,7 @@
   <string name="pref_use_tor_summary">所有连接使用 Tor 网络传输，需要 Orbot</string>
   <string name="account_settings_hostname">主机名</string>
   <string name="account_settings_port">端口</string>
-  <string name="hostname_or_onion">服务器 - 或者 .orion 地址</string>
+  <string name="hostname_or_onion">服务器 - 或者 .onion 地址</string>
   <string name="not_a_valid_port">该端口号无效</string>
   <string name="not_valid_hostname">该主机名无效</string>
   <string name="connected_accounts">%2$d 个中的 %1$d 个账户已连接</string>
@@ -550,7 +555,7 @@
   <string name="gp_short">短</string>
   <string name="gp_medium">中</string>
   <string name="gp_long">长</string>
-  <string name="pref_broadcast_last_activity">广播最后打开该应用的时间</string>
+  <string name="pref_broadcast_last_activity">广播最后使用应用的时间</string>
   <string name="pref_broadcast_last_activity_summary">让你的所有联系人知道你使用畅聊的时间</string>
   <string name="pref_privacy">隐私</string>
   <string name="pref_theme_options">主题</string>
@@ -562,8 +567,8 @@
   <string name="pref_use_green_background_summary">接收到的消息使用绿色背景</string>
   <string name="unable_to_connect_to_keychain">无法连接到 OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">此设备不再使用</string>
-  <string name="type_pc">计算机</string>
-  <string name="type_phone">移动电话</string>
+  <string name="type_pc">电脑</string>
+  <string name="type_phone">手机</string>
   <string name="type_tablet">平板</string>
   <string name="type_web">浏览器</string>
   <string name="type_console">控制台</string>
@@ -639,6 +644,7 @@
   <string name="corresponding_conversations_closed">相应的对话已关闭。</string>
   <string name="contact_blocked_past_tense">联系人已屏蔽</string>
   <string name="pref_notifications_from_strangers">陌生人也通知</string>
+  <string name="pref_notifications_from_strangers_summary">提醒来自陌生人的消息与通话</string>
   <string name="received_message_from_stranger">已收到陌生人的信息</string>
   <string name="block_stranger">屏蔽陌生人</string>
   <string name="block_entire_domain">屏蔽整个域名</string>
@@ -737,9 +743,14 @@
   <string name="error_channel_name">连接问题</string>
   <string name="error_channel_description">此通知类别用于显示一旦帐户连接出现问题的通知。</string>
   <string name="notification_group_messages">消息</string>
+  <string name="notification_group_calls">通话</string>
   <string name="messages_channel_name">消息</string>
+  <string name="incoming_calls_channel_name">来电</string>
+  <string name="ongoing_calls_channel_name">正在进行的通话</string>
   <string name="silent_messages_channel_name">无声消息</string>
   <string name="silent_messages_channel_description">此通知组用于显示不应触发任何声音的通知。 例如，当在另一个设备上激活时（宽限期）。</string>
+  <string name="pref_message_notification_settings">消息通知设置</string>
+  <string name="pref_incoming_call_notification_settings">来电通知设置</string>
   <string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
   <string name="video_compression_channel_name">视频压缩</string>
   <string name="view_media">查看媒体文件</string>
@@ -775,7 +786,7 @@
   <string name="abort_registration_procedure">确定放弃注册？</string>
   <string name="yes">是</string>
   <string name="no">否</string>
-  <string name="verifying">正在验证......</string>
+  <string name="verifying">正在验证.....</string>
   <string name="requesting_sms">请求短信...</string>
   <string name="incorrect_pin">验证码错误。</string>
   <string name="pin_expired">验证码已失效</string>
@@ -832,7 +843,7 @@
   <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="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>
@@ -847,7 +858,7 @@
   <string name="discover_channels">发现群聊</string>
   <string name="search_channels">搜索群聊</string>
   <string name="channel_discovery_opt_in_title">可能侵犯隐私！</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[频道发现使用了名为<a href="https://search.jabber.network">search.jabber.network</a>。<br><br>的第三方服务。使用此功能会将您的IP地址和搜索字词传输到该服务。 有关更多信息，请参见其<a href="https://search.jabber.network/privacy">Privacy Policy</a>。]]></string>
+  <string name="channel_discover_opt_in_message"><![CDATA[群聊发现使用了名为<a href="https://search.jabber.network">search.jabber.network</a>。<br><br>的第三方服务。使用此功能会将您的IP地址和搜索字词传输到该服务。 有关更多信息，请参见其<a href="https://search.jabber.network/privacy">Privacy Policy</a>。]]></string>
   <string name="i_already_have_an_account">我已有账户</string>
   <string name="add_existing_account">添加已有账户</string>
   <string name="register_new_account">注册新账户</string>
@@ -868,10 +879,38 @@
   <string name="jabber_network">jabber.network</string>
   <string name="local_server">本地服务器</string>
   <string name="pref_channel_discovery_summary">大多数用户应该选择“ jabber.network”以从整个XMPP生态系统中获得更好的建议。</string>
-  <string name="pref_channel_discovery">频道发现方法</string>
+  <string name="pref_channel_discovery">群聊发现方法</string>
   <string name="backup">备份</string>
   <string name="category_about">关于</string>
   <string name="please_enable_an_account">请启用一个帐户</string>
+  <string name="make_call">拨打电话</string>
+  <string name="rtp_state_incoming_call">来电</string>
+  <string name="rtp_state_incoming_video_call">视频来电</string>
+  <string name="rtp_state_connecting">正在连接</string>
+  <string name="rtp_state_connected">已连接</string>
+  <string name="rtp_state_accepting_call">正在接受通话</string>
+  <string name="rtp_state_ending_call">正在结束通话</string>
+  <string name="answer_call">接电话</string>
+  <string name="dismiss_call">忽略</string>
+  <string name="rtp_state_finding_device">正在确定设备位置</string>
+  <string name="rtp_state_ringing">正在响铃</string>
+  <string name="rtp_state_declined_or_busy">忙碌</string>
+  <string name="rtp_state_connectivity_error">无法接通来电</string>
+  <string name="rtp_state_retracted">撤销的通话</string>
+  <string name="rtp_state_application_failure">程序错误</string>
+  <string name="hang_up">挂断</string>
+  <string name="ongoing_call">正在进行的通话</string>
+  <string name="ongoing_video_call">正在进行的视频通话</string>
+  <string name="disable_tor_to_make_call">禁用Tor以拨打电话</string>
+  <string name="incoming_call">来电</string>
+  <string name="incoming_call_duration">来电%s</string>
+  <string name="outgoing_call">去电</string>
+  <string name="outgoing_call_duration">去电%s</string>
+  <string name="missed_call">未接电话</string>
+  <string name="audio_call">语音通话</string>
+  <string name="video_call">视频通话</string>
+  <string name="microphone_unavailable">麦克风不可用</string>
+  <string name="only_one_call_at_a_time">在同一时间只能打一通电话</string>
   <plurals name="view_users">
     <item quantity="other">查看%1$d成员</item>
   </plurals>