diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 6172375039b94bbb03f5013d8eda95c2e027fc18..bee7731727456028dd18b58b376f98695b2127bf 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -10,6 +10,8 @@
   <string name="no_browser_app_installed">No s\'ha trobat cap navegador web, instal·leu-ne un per a visualitzar aquesta pàgina</string>
   <string name="email_chooser_title">Envia correu mitjançant...</string>
   <string name="website_chooser_title">Visualitza el lloc web amb...</string>
+  <string name="license">Aquest programari es proporciona \"tal i com es\" sense garantia de cap tipus. Per més detalls, veure la<u> Llicència Pública General GNU versió 3 o posterior</u> </string>
+  <string name="description">Jami és un programari lliure de comunicació universal, que respecta les llibertats i la privacitat dels seus usuaris.</string>
   <string name="credits">Crèdits</string>
   <!--About dialog-->
   <string name="developed_by">Desenvolupat per</string>
@@ -31,6 +33,7 @@
   <string name="menu_item_account">Administració del compte</string>
   <string name="menu_item_settings">Opcions</string>
   <string name="menu_item_share">Comparteix el meu contacte</string>
+  <string name="menu_item_about">Sobre Jami...</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Marca un número</string>
   <!--History Fragment-->
@@ -52,26 +55,37 @@
   <string name="notif_incoming_call">Trucada entrant</string>
   <string name="notif_outgoing_call_title">Trucada sortint de %1$s</string>
   <string name="notif_outgoing_call">Trucada sortint</string>
-  <string name="notif_current_call">Trucada sortint</string>
+  <string name="notif_current_call_title">Trucada en curs amb%1$s</string>
+  <string name="notif_current_call">Trucada en curs</string>
+  <string name="notif_channel_call_in_progress">Trucant...</string>
   <string name="notif_channel_calls">Trucades</string>
+  <string name="notif_channel_missed_calls">Trucades perdudes</string>
+  <string name="notif_channel_incoming_calls">Trucades entrants</string>
   <string name="notif_channel_messages">Missatges</string>
   <string name="notif_channel_requests">Peticions</string>
   <string name="notif_channel_file_transfer">Transferència de fitxers</string>
   <string name="notif_group_calls">Trucades</string>
+  <string name="notif_background_service">Jami s\'està executant en segon pla</string>
   <string name="notif_mark_as_read">Marca com a llegit</string>
   <string name="notif_incoming_file_transfer">Alguna persona us està enviant un fitxer</string>
-  <string name="notif_outgoing_file_transfer">Alguna persona us està enviant un fitxer</string>
+  <string name="notif_outgoing_file_transfer">Algú prova d\'enviar-te un fitxer</string>
   <string name="action_open">Obre</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Usuari:</string>
   <string name="action_call_hangup">Penja</string>
-  <string name="ongoing_call">Trucada sortint</string>
+  <string name="ongoing_call">Trucada en curs</string>
   <string name="hist_in_call">Trucada entrant de %1$s</string>
   <string name="hist_out_call">Trucada sortint a %1$s</string>
+  <string name="start_error_title">Jami no arrenca!</string>
+  <string name="start_error_mic_required">Jami requereix de permís d\'accés al micròfon per funcionar.</string>
   <string name="action_call_accept">Despenja</string>
   <string name="action_call_decline">Rebutja</string>
+  <string name="action_call_mic_mute">Silencia el micròfon</string>
   <string name="ab_action_speakerphone">Activa l\'altaveu</string>
   <string name="ab_action_contact_add">Afegeix als contactes</string>
+  <string name="ab_action_contact_add_question">Afegir als contactes?</string>
+  <string name="hist_contact_added">Contacte afegit</string>
+  <string name="hist_invitation_received">S\'ha rebut una invitació</string>
   <string name="ab_action_audio_call">Trucada de veu</string>
   <string name="ab_action_video_call">Videotrucada </string>
   <string name="ab_action_change_screen_orientation">Canvia l\'orientació de la pantalla</string>
@@ -82,13 +96,17 @@
   <!--Text messages-->
   <string name="send_message">Envia el missatge</string>
   <string name="message_sending">S\'està enviant el missatge</string>
+  <string name="message_failed">Ha fallat</string>
   <string name="time_just_now">Ara mateix</string>
   <string name="send_file">Envia el fitxer</string>
+  <string name="hist_file_sent">Fitxer enviat</string>
+  <string name="hist_file_received">S\'ha rebut un fitxer</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Permís de la càmera</string>
   <string name="permission_dialog_camera_message">Habiliteu el permís de la càmera perquè funcionin les trucades de vídeo. </string>
   <string name="ringtone_error_title">Error</string>
   <string name="ringtone_error_format_not_supported">Aquest format no és compatible.</string>
+  <string name="ringtone_error_size_too_big">Aquest arxiu és massa gran. La mida màxima és %1$dkB.</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
diff --git a/ring-android/app/src/main/res/values-ca/strings_call.xml b/ring-android/app/src/main/res/values-ca/strings_call.xml
index 6b414b405d6379d26152452557627050655063f7..01944a65437109d933d213efd1508e95a36f299b 100644
--- a/ring-android/app/src/main/res/values-ca/strings_call.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_call.xml
@@ -26,6 +26,7 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_connecting">Connectant</string>
     <string name="call_human_state_current">Parlant</string>
     <string name="call_human_state_busy">Ocupat</string>
+    <string name="call_human_state_failure">Ha fallat</string>
     <string name="call_human_state_hold">En espera</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 810deeff2fedc70a883e19e3692ee785323e6e84..fb81d0344a1db2980211276ef6585328ae956308 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -56,9 +56,12 @@
   <string name="notif_incoming_call">来电</string>
   <string name="notif_outgoing_call_title">去电：%1$s</string>
   <string name="notif_outgoing_call">去电</string>
+  <string name="notif_current_call_title">正在与%1$s通话</string>
   <string name="notif_current_call">正在通话</string>
+  <string name="notif_channel_call_in_progress">呼叫进行中</string>
   <string name="notif_channel_calls">呼叫</string>
   <string name="notif_channel_missed_calls">未接电话</string>
+  <string name="notif_channel_incoming_calls">来电</string>
   <string name="notif_channel_messages">消息</string>
   <string name="notif_channel_requests">请求</string>
   <string name="notif_channel_file_transfer">文件传输</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index e3b62d5578652be787d248d8baa7548a1d9cfd98..e5c4c2cdf814757cc4ab8f380f6e7c642ac640fc 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">添加Jami账户</string>
   <string name="add_sip_account_title">添加SIP帐户</string>
+  <string name="ring_account_default_name">Jami 用户%1$s</string>
   <string name="prompt_alias">别名</string>
   <string name="prompt_hostname">主机名</string>
   <string name="prompt_username">用户名</string>
@@ -43,6 +44,9 @@
   <string name="account_device_revocation_wrong_password">密码错误。</string>
   <string name="account_device_revocation_unknown_device">未知设备。</string>
   <string name="account_device_revocation_error_unknown">未知错误。</string>
+  <string name="account_password_change">更改密码</string>
+  <string name="account_password_set">设置密码</string>
+  <string name="account_password_change_wait_message">更改用户密码</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">通用</string>
   <string name="account_basic_category">基本设置</string>
@@ -112,6 +116,7 @@
   <string name="error_password_char_count">最少6字符</string>
   <string name="error_passwords_not_equals">密码不匹配</string>
   <string name="export_account_wait_title">请稍等…</string>
+  <string name="export_account_wait_message">导出用户信息</string>
   <string name="account_export_file">备份帐户</string>
   <string name="account_export_end_decryption_message">使用该密码无法解锁您的帐户。</string>
   <string name="account_export_end_network_title">网络错误</string>
@@ -142,6 +147,8 @@
   <string name="account_sip_success_title">SIP帐户已注册</string>
   <string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
   <string name="account_sip_register_anyway">仍然注册</string>
+  <string name="account_link_button">从网络关联</string>
+  <string name="account_link_archive_button">从备份文件关联</string>
   <string name="account_link_prompt_pin">输入PIN</string>
   <string name="account_new_button">创建一个Jami账户</string>
   <string name="account_link_export_button">将另一设备与该帐户进行连接</string>
@@ -154,12 +161,14 @@
   <!--Name registration-->
   <string name="error_username_empty">输入用户名</string>
   <string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
+  <string name="username_available">用户名不可用！</string>
   <string name="register_name">注册名称</string>
   <string name="trying_to_register_name">正在尝试注册用户名</string>
   <string name="registered_username">已注册的用户名</string>
   <string name="register_username">注册公开用户名（推荐）</string>
   <string name="username_already_taken">用户名已被占用</string>
   <string name="invalid_username">非法用户名</string>
+  <string name="unknown_error">未知错误。请检查你的网络连接。</string>
   <string name="looking_for_username_availability">正在检测用户名是否可用…</string>
   <string name="account_status_connecting">正在连接</string>
   <string name="account_status_connection_error">连接错误</string>