Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0

35 files changed, 656 insertions, 10 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 5ef8b5811..045d620f8 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Data dienste moet tydelik onderbreek word. Is jy seker jy wil voortgaan?</string>
   <string name="simContacts_title_cm">Bestuur SIM kaart kontakte</string>
   <string name="sip_accounts_title_cm">SIP rekeninge</string>
+  <string name="respond_via_sms_cannot_be_empty">Vinnige antwoord kan nie leeg wees nie</string>
+  <string name="call_recording_format">Oproep opname formaat</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ba94138b5..0215cfd27 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">El servei de dades necessita desconnectar-se temporalment. Estàs segur que vols continuar?</string>
   <string name="simContacts_title_cm">Gestiona els contactes de la targeta SIM</string>
   <string name="sip_accounts_title_cm">Comptes SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">La resposta ràpida no pot estar buida</string>
+  <string name="call_recording_format">Format de gravació de trucades</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 02c4c088e..b77ca0f0c 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Je potřeba dočasně odpojit datové služby. Chcete pokračovat?</string>
   <string name="simContacts_title_cm">Spravovat kontakty na SIM kartě</string>
   <string name="sip_accounts_title_cm">SIP účty</string>
+  <string name="respond_via_sms_cannot_be_empty">Rychla reakce nemůže být prázdná</string>
+  <string name="call_recording_format">Formát záznamu hovoru</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 5cb3747d1..6035280b5 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Data service skal afbrydes midlertidigt. Vil du fortsætte?</string>
   <string name="simContacts_title_cm">Administrér SIM-kort kontakter</string>
   <string name="sip_accounts_title_cm">SIP-konti</string>
+  <string name="respond_via_sms_cannot_be_empty">Hurtig svar kan ikke være tom</string>
+  <string name="call_recording_format">Format til optagelse af opkald</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index ea0f5891c..b5ca361a3 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -226,6 +226,7 @@
   <string name="no_vt_allowed">Deaktivieren Sie den TTY-Modus, um Videoanrufe tätigen zu können</string>
   <string name="ims_edit_title">IMS-Kontodetails</string>
   <string name="ims_accounts_title">IMS-Konto</string>
+  <string name="mo_call_type_title">MOC-Typ</string>
   <string name="ims_service_capability">IP Multimedia Subsystem (IMS) aktivieren/deaktivieren</string>
   <string name="ims_service_capability_title">IMS Servicefähigkeit</string>
   <string name="ims_menu_save">Speichern</string>
@@ -283,4 +284,6 @@
   <string name="disconnect_data_confirm">Datendienst muss vorübergehend getrennt werden. Sind Sie sicher, dass Sie fortfahren möchten?</string>
   <string name="simContacts_title_cm">Kontakte auf SIM-Karte verwalten</string>
   <string name="sip_accounts_title_cm">SIP-Konten</string>
+  <string name="respond_via_sms_cannot_be_empty">Schnelle Antwort darf nicht leer sein</string>
+  <string name="call_recording_format">Anrufaufnahme-Format</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 7281b5057..c05b2f1e4 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Η υπηρεσία δεδομένων πρέπει να διακοπεί προσωρινά. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;</string>
   <string name="simContacts_title_cm">Διαχείριση επαφών κάρτας SIM</string>
   <string name="sip_accounts_title_cm">Λογαριασμοί SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Η γρήγορη απάντηση δεν μπορεί να είναι κενή</string>
+  <string name="call_recording_format">Μορφή ηχογράφησης κλήσεων</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index e9d786218..3147412c7 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">El servicio de datos se desconectará temporalmente. ¿Estás seguro de que quieres continuar?</string>
   <string name="simContacts_title_cm">Gestionar contactos de tarjeta SIM</string>
   <string name="sip_accounts_title_cm">Cuentas SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">La respuesta rápida no puede estar vacía</string>
+  <string name="call_recording_format">Formato de grabación de llamada</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 9c4bda026..7c4fe3abf 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Yhteys datapalveluun pitää katkaista hetkeksi. Haluatko varmasti jatkaa?</string>
   <string name="simContacts_title_cm">Hallitse SIM-kortin yhteystietoja</string>
   <string name="sip_accounts_title_cm">SIP tilit</string>
+  <string name="respond_via_sms_cannot_be_empty">Pikavastaus ei voi olla tyhjä</string>
+  <string name="call_recording_format">Soiton tallennuksen muoto</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index ed9ff5c23..ada46c930 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -121,6 +121,7 @@
   <string name="emergency_number_exist">Le numéro d\'urgence saisi existe déjà.</string>
   <string name="emergency_number_save_error">Le numéro d\'urgence saisi est trop long.</string>
   <string name="ipcall_sub_title">Préfixe de numérotation d\'appel IP</string>
+  <string name="ipcall_sub_summery">Modifier le préfixe d\'appel du service IP</string>
   <string name="ipcall_dialog_title">Paramètres des appels IP</string>
   <string name="ipcall_dialog_edit_hint">Préfixe de numérotation d\'appel IP</string>
   <string name="notification_missedVideoCallTitle">Appel vidéo manqué</string>
@@ -139,9 +140,56 @@
   <string name="uplmn_list_setting_add_plmn">Nouveau PLMN</string>
   <string name="gsm_umts_network_preferences_title">Mode réseau</string>
   <string name="gsm_umts_network_preferences_dialogtitle">Mode réseau</string>
+  <string name="label_nsdp">Déloquer le code PIN de la SIM de sous-réseau</string>
+  <string name="label_cdp">Débloquer le code PIN de la carte SIM d\'entreprise</string>
   <string name="label_spdp">Débloquer le code PIN de la carte SIM du prestataire de services</string>
   <string name="label_sdp">Débloquer le code PIN de la carte SIM</string>
+  <string name="label_rn1dp">Réseau RUIM 1 déverrouille le code PIN</string>
+  <string name="label_rn2dp">Débloquer le code PIN RUIM du réseau 2</string>
+  <string name="label_rhrpd">RUIM HRPD déverrouille le code PIN</string>
+  <string name="label_rcdp">RUIM d\'entreprise déverrouille le code PIN</string>
+  <string name="label_rspdp">Le fournisseur de service RUIM déverrouille le code PIN</string>
+  <string name="label_rdp">RUIM déverrouille le code PIN</string>
   <string name="label_puk">Entrer le code PUK</string>
+  <string name="requesting_unlock_cm">Requête de déverrouillage réseau\u2026</string>
+  <string name="requesting_nw_subset_unlock">Requête de déverrouillage du sous réseau SIM\u2026</string>
+  <string name="requesting_sp_unlock">Requête de déverrouillage du fournisseur de service SIM\u2026</string>
+  <string name="requesting_corporate_unlock">Requête de déverrouillage SIM entreprise\u2026</string>
+  <string name="requesting_sim_unlock">Requête de déverrouillage SIM\u2026</string>
+  <string name="requesting_rnw1_unlock">Requête de déverrouillage du réseau 1 RUIM\u2026</string>
+  <string name="requesting_rnw2_unlock">Requête de déverrouillage du réseau 2 RUIM\u2026</string>
+  <string name="requesting_rhrpd_unlock">Requête de déverrouillage de RUIM HRPD\u2026</string>
+  <string name="requesting_rsp_unlock">Requête de déverrouillage du fournisseur de service RUIM\u2026</string>
+  <string name="requesting_rc_unlock">Requête de déverrouillage du RUIM d\'entreprise\u2026</string>
+  <string name="requesting_ruim_unlock">Requête de déverrouillage RUIM\u2026</string>
+  <string name="requesting_puk_unlock">Requête de déverrouillage PUK\u2026</string>
+  <string name="unlock_failed_cm">Déverrouillage réseau échoué.</string>
+  <string name="nw_subset_unlock_failed">La demande de déverrouillage de la SIM de sous-réseau a échoué.</string>
+  <string name="sp_unlock_failed">La demande de déverrouillage du prestataire de services de la SIM a échoué.</string>
+  <string name="corporate_unlock_failed">La demande de déverrouillage de la carte SIM d\'entreprise a échoué.</string>
+  <string name="sim_unlock_failed">La demande de déverrouillage de la carte SIM a échoué.</string>
+  <string name="rnw1_unlock_failed">Requête de déverrouillage du réseau 1 RUIM échouée.</string>
+  <string name="rnw2_unlock_failed">Requête de déverrouillage du réseau 2 RUIM échouée.</string>
+  <string name="rhrpd_unlock_failed">Requête de déverrouillage RUIM HRPD échouée.</string>
+  <string name="rsp_unlock_failed">Requête de déverrouillage du fournisseur de réseau RUIM échouée.</string>
+  <string name="rc_unlock_failed">Requête de déverrouillage RUIM d\'entreprise échouée.</string>
+  <string name="ruim_unlock_failed">Requête de déverrouillage RUIM échoué.</string>
+  <string name="puk_unlock_failed">Échec du déverrouillage du code PUK.</string>
+  <string name="unlock_success_cm">Déverrouillage réseau réussi.</string>
+  <string name="nw_subset_unlock_success">Sous réseau SIM déverrouillé avec succès.</string>
+  <string name="sp_unlock_success">Fournisseur de services SIM débloqué avec succès.</string>
+  <string name="corporate_unlock_success">SIM d\'entreprise débloqué avec succès.</string>
+  <string name="sim_unlock_success">SIM débloquée avec succès.</string>
+  <string name="rnw1_unlock_success">Réseau 1 RUIM déverrouillé avec succès.</string>
+  <string name="rnw2_unlock_success">Réseau 2 RUIM déverrouillé avec succès.</string>
+  <string name="rhrpd_unlock_success">Déverrouillage RUIM HRPD effectué.</string>
+  <string name="rsp_unlock_success">Service RUIM déverrouillé avec succès.</string>
+  <string name="rc_unlock_success">RUIM d\'entreprise déverrouillé avec succès.</string>
+  <string name="ruim_unlock_success">RUIM déverrouillé avec succès.</string>
+  <string name="puk_unlock_success">Code PUK déverrouillé avec succès.</string>
+  <string name="stk_cc_ss_to_dial_error">La requête SS a été modifiée en requête d\'appel.</string>
+  <string name="stk_cc_ss_to_ussd_error">La requête SS a été modifié en requête USSD.</string>
+  <string name="stk_cc_ss_to_ss_error">La requête SS a été modifiée en une nouvelle requête SS.</string>
   <string name="preferred_network_mode_global_summary_cm">Mode réseau préféré : Global (CDMA/EvDo/LTE/GSM/WCDMA)</string>
   <string name="preferred_network_mode_td_scdma_only_summary">Mode réseau préféré : TD-SCDMA seulement</string>
   <string name="preferred_network_mode_td_scdma_wcdma_summary">Mode réseau préféré : TD-SCDMA/WCDMA</string>
@@ -169,6 +217,7 @@
   <string name="xdivert_not_supported">X-Divert non pris en charge par le CDMA</string>
   <string name="xdivert_enternumber_error">Entrer le numéro de téléphone pour chaque carte SIM</string>
   <string name="xdivert_partial_set">X-Divert a été défini que pour la première carte SIM</string>
+  <string name="xdivert_sub_absent">Chaque carte SIM doit être activée au traitement X-Divert</string>
   <string name="xdivert_status">Statut X-Divert</string>
   <string name="xdivert_active">Actif</string>
   <string name="xdivert_not_active">Inactif</string>
@@ -178,6 +227,8 @@
   <string name="ims_edit_title">Détails du compte IMS</string>
   <string name="ims_accounts_title">Compte IMS</string>
   <string name="mo_call_type_title">Type d\'appel MO</string>
+  <string name="ims_service_capability">Activer/désactiver la capacité du service</string>
+  <string name="ims_service_capability_title">Capacité du service IMS</string>
   <string name="ims_menu_save">Enregistrer</string>
   <string name="ims_menu_discard">Ignorer</string>
   <string name="remove_ims_account">Supprimer le compte</string>
@@ -200,7 +251,15 @@
   <string name="contactAddSuccess">Contact ajouté à la carte SIM avec succès</string>
   <string name="contactAddFailed">Impossible d\'ajouter le contact à la carte SIM</string>
   <string name="contactUpdateSuccess">Contact de la carte SIM mis à jour avec succès</string>
+  <string name="contactUpdateFailed">Impossible de mettre à jour le contact de la carte SIM</string>
+  <string name="contactdeleteSuccess">Contact supprimé de la carte SIM avec succés</string>
+  <string name="contactdeleteFailed">Impossible de supprimer le contact de la carte SIM</string>
+  <string name="allContactdeleteSuccess">Tous les contacts de la carte SIM ont été supprimés</string>
+  <string name="allContactdeleteFailed">Impossible de supprimer tous les contacts de la carte SIM</string>
   <string name="exportAllcontatsSuccess">Tous les contacts ont été exportés vers la carte SIM avec succès</string>
+  <string name="exportAllcontatsFailed">Impossible d\'exporter tous les contacts vers la carte SIM</string>
+  <string name="exportAllcontatsNoContacts">Aucun contact trouvé à exporter sur la carte SIM</string>
+  <string name="cursorError">Données de curseur non valide</string>
   <string name="set_subscription">Configurer les cartes SIM</string>
   <string name="set_subscription_error_atleast_one">Sélectionner au moins une carte SIM</string>
   <string name="set_uicc_subscription_progress">Paramètre d\'abonnement\u2026</string>
@@ -225,4 +284,6 @@
   <string name="disconnect_data_confirm">Le service de donnés doit être déconnecté temporairement. Êtes-vous sûr de vouloir continuer\u00A0?</string>
   <string name="simContacts_title_cm">Gérer les contacts de la carte SIM</string>
   <string name="sip_accounts_title_cm">Comptes SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">La réponse rapide ne peut pas être vide</string>
+  <string name="call_recording_format">Format enregistrement d\'appel</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 80adf5ac1..d3c2cbdfe 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Adatszolgáltatást ideiglenesen le kell kapcsolni. Biztosan folytatni kívánja?</string>
   <string name="simContacts_title_cm">SIM névjegyek kezelése</string>
   <string name="sip_accounts_title_cm">SIP fiókok</string>
+  <string name="respond_via_sms_cannot_be_empty">Gyors válasz nem lehet üres</string>
+  <string name="call_recording_format">Hívásfelvétel formátuma</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 9ff2f3946..cadc8786b 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -285,4 +285,6 @@
   <string name="disconnect_data_confirm">Layanan data perlu diputus sementara. Anda yakin ingin melanjutkan?</string>
   <string name="simContacts_title_cm">Kelola kontak kartu SIM</string>
   <string name="sip_accounts_title_cm">Akun SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Respon cepat tidak boleh kosong</string>
+  <string name="call_recording_format">Format perekaman panggilan</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 5be531d14..56c19358f 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Il servizio dati deve essere disconnesso temporaneamente. Sei sicuro di voler continuare?</string>
   <string name="simContacts_title_cm">Gestisci i contatti della SIM</string>
   <string name="sip_accounts_title_cm">Account SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">La risposta rapida non può essere vuota</string>
+  <string name="call_recording_format">Formato registrazione chiamata</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 5bc58ce5c..54ef68a6c 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">データサービスを一時的に切断する必要があります。続けてもよろしいですか？</string>
   <string name="simContacts_title_cm">SIMカードの連絡先を管理</string>
   <string name="sip_accounts_title_cm">SIPアカウント</string>
+  <string name="respond_via_sms_cannot_be_empty">クイック返信は空にできません</string>
+  <string name="call_recording_format">通話の録音形式</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index ae394b5e7..109ef5650 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">데이터 연결이 일시적으로 중단됩니다. 계속하시겠습니까?</string>
   <string name="simContacts_title_cm">SIM 카드 연락처 관리</string>
   <string name="sip_accounts_title_cm">SIP 계정</string>
+  <string name="respond_via_sms_cannot_be_empty">빠른 응답 메시지는 비워둘 수 없습니다</string>
+  <string name="call_recording_format">통화 녹음 형식</string>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 28bf068e7..0e25574ff 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -17,11 +17,28 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_notif_unconditionalCF">Bédéngungslos Uruffweiderleedung aktiv</string>
+  <string name="call_notif_conditionalCF">Bédéngungslos Uruffweiderleedung aktiv</string>
+  <string name="call_notif_MOcall_forwarding">De lafenden Uruff gëtt weidergeleet</string>
+  <string name="call_notif_cugcall">Uruff an enger geschlossener Benotzergrupp</string>
+  <string name="call_notif_outgoing_barred">Erausgoend Uriff gespaart</string>
+  <string name="call_notif_MTcall_forwarding">Erakommenden Uruff gëtt weidergeleet</string>
+  <string name="call_notif_multipartycall">Telefonskonferenz</string>
+  <string name="call_notif_forwardcheckreceived">Uruff gouf weidergeleet</string>
+  <string name="vibrate_outgoing">Bei Äntwert vibréieren</string>
+  <string name="vibrate_call_waiting">Vibréiere wann en Uruff waart</string>
   <string name="vibrate_hangup">Vibréiere beim Anhänken</string>
+  <string name="vibrate_45">All Minutt virbréieren</string>
   <string name="blacklist_title">Schwaarz Lëscht</string>
   <string name="blacklist_summary_disabled">Desaktivéiert</string>
+  <string name="blacklist_call_notification">Uruff vum %s blockéiert</string>
+  <string name="blacklist_call_notification_multiple"><xliff:g id="count">%d</xliff:g> uriff goufe blockéiert</string>
+  <string name="blacklist_message_notification">E Message vum %s gouf blockéiert</string>
   <string name="blacklist_notification_list_private">Privat</string>
+  <string name="unblock_number">Deblockéieren</string>
   <string name="perm_change_mobile_network">Netzwierkmodus wiesselen (2G/3G)</string>
+  <string name="phone_number_label">Meng Telefonsnummer</string>
+  <string name="phone_number_summary">Telefonsnummer fir dësen Apparat definéieren</string>
   <string name="noise_suppression_title">Rauschënnerdréckung</string>
   <string name="noise_suppression_summary">Rauschënnerdréckung fir Telefonsgespréicher</string>
   <string name="preferred_network_mode_td_scdma_only">just TD-SCDMA</string>
@@ -34,15 +51,39 @@
   <string name="preferred_network_mode_gsm_only">just GSM</string>
   <string name="preferred_network_mode_gsm_wcdma_preferred">GSM/WCDMA preferéiert</string>
   <string name="number_lookup">Sich no Telefonsnummer</string>
+  <string name="enable_forward_lookup_title">Direktsich</string>
   <string name="enable_people_lookup_title">Persounesich</string>
+  <string name="enable_reverse_lookup_title">Ëmgedréinte Sich</string>
+  <string name="choose_lookup_providers">Service auswielen</string>
+  <string name="choose_forward_lookup_provider_title">Service fir déi direkt Sich</string>
+  <string name="choose_people_lookup_provider_title">Service fir d\'Persounesich</string>
+  <string name="choose_reverse_lookup_provider_title">Service fir d\'ëmgedréinte Sich</string>
+  <string name="sim_name">SIM-Numm</string>
   <string name="sub_no_sim">Keng SIM</string>
+  <string name="sub_active">Aktiv</string>
+  <string name="sub_not_active">Net aktiv</string>
+  <string name="msim_call_selector_title"><xliff:g id="number">%s</xliff:g> uruffen iwwer</string>
+  <string name="msim_call_selector_item">SIM<xliff:g id="index">%1$d</xliff:g>: <xliff:g id="operator">%2$s</xliff:g></string>
+  <string name="cyngn_reverse_lookup_provider_name">Cyngn-Chineesesch (CN)</string>
+  <string name="t9_search_input_locale">T9-Sichagab</string>
   <string name="t9_search_input_locale_default">Standard</string>
+  <string name="incoming_call_style_classic">Klassesch</string>
   <string name="network_forbidden">(Verbueden)</string>
+  <string name="proximity_mode_title">Proximitéitssensor aktivéieren</string>
+  <string name="call_barring">Uruffspär</string>
   <string name="call_barring_off">Aus</string>
+  <string name="call_barring_outgoing">Blockéierung vun erausgoenden Uriff</string>
+  <string name="call_barring_outgoing_international_roaming">International Roaming-Uriff</string>
+  <string name="call_barring_outgoing_international">International Uriff</string>
   <string name="call_barring_outgoing_all">All d\'erausgoend Gespréicher</string>
+  <string name="call_barring_incoming_all">All erakommend Uriff</string>
   <string name="input_password">Passwuert aginn</string>
+  <string name="psw_enter_old">Aktuellt Passwuert</string>
+  <string name="labelCbChangePassword">Passwuert änneren</string>
+  <string name="psw_enter_new">Neit Passwuert</string>
   <string name="invalidPsw">Gëff däi Passwuert an (4 - 8 Zifferen)</string>
   <string name="psw_reenter_new">Neit Passwuert bestätegen</string>
+  <string name="cb_psw_dont_match">D\'Passwierder stëmmen net iwwereneen</string>
   <string name="operation_successfully">Operatioun erfollegräich ofgeschloss</string>
   <string name="emergency_call">Uruffen</string>
   <string name="new_emergency_number">Nei Noutruffnummer</string>
@@ -51,6 +92,9 @@
   <string name="ipcall_dialog_title">Astellunge fir IP-Uriff</string>
   <string name="ipcall_dialog_edit_hint">Prefix fir IP-Uriff</string>
   <string name="notification_missedVideoCallTitle">Verpasste Videouruff</string>
+  <string name="notification_missedVideoCallsTitle">Verpasst Videouriff</string>
+  <string name="notification_missedVideoCallsMsg"><xliff:g id="num_missed_calls">%1$s</xliff:g> verpasst Videouriff</string>
+  <string name="notification_missedVideoCallTicker">Verpasste Videouruff vum <xliff:g id="missed_call_from">%1$s</xliff:g></string>
   <string name="preferred_network_mode_dialogtitle_cmcc">Netzwierkmodus</string>
   <string name="preferred_network_mode_4g_3g_2g_auto_summary">4G/3G/2G (auto)</string>
   <string name="preferred_network_mode_3g_2g_auto_summary">3G/2G (auto)</string>
@@ -62,7 +106,13 @@
   <string name="uplmn_list_setting_add_plmn">Neit PLMN</string>
   <string name="gsm_umts_network_preferences_title">Netzwierkmodus</string>
   <string name="gsm_umts_network_preferences_dialogtitle">Netzwierkmodus</string>
+  <string name="label_nsdp">PIN fir d\'Netzlëscht ze entspäeren</string>
+  <string name="label_sdp">SIM-Entspär-PIN</string>
+  <string name="label_rdp">Entspär-PIN vun der RUIM-Kaart</string>
   <string name="label_puk">PUK aginn</string>
+  <string name="puk_unlock_failed">PUK-Entspäerung erfollegräich.</string>
+  <string name="ruim_unlock_success">RUIM-Entspärung erfollegräich.</string>
+  <string name="puk_unlock_success">PUK-Entspärung erfollegräich.</string>
   <string name="stk_cc_ss_to_dial_error">D\'SS-Ufro gouf an eng DIAL-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ss_to_ussd_error">D\'SS-Ufro gouf an eng USSD-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ss_to_ss_error">D\'SS-Ufro gouf an eng nei SS-Ufro ëmgewandelt.</string>
@@ -77,13 +127,21 @@
   <string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">Preferéierten Netzwierktyp: TD-SCDMA/GSM/WCDMA/LTE</string>
   <string name="preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma_summary">Preferéierten Netzwierktyp: TD-SCDMA/LTE/CDMA/EvDo/GSM/WCDMA</string>
   <string name="preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma_summary">Preferéierten Netzwierktyp: TD-SCDMA/CDMA/EvDo/GSM/WCDMA</string>
+  <string name="network_settings_sel_sub">SIM-Kaarten-Astellungen</string>
+  <string name="callind_multi_sim">SIM-Kaarten-Astellungen</string>
   <string name="xdivert_summary">CFNRc-Astellungen</string>
   <string name="phone_numbers">Telefonsnummeren aginn</string>
+  <string name="sub1LineNumber">Telefonsnummer (SIM 1):</string>
+  <string name="sub2LineNumber">Telefonsnummer (SIM 2):</string>
+  <string name="proceed">Weider</string>
   <string name="sum_xdivert_enabled">Ëmleedung aktivéiert</string>
   <string name="sum_xdivert_disabled">Ëmleedung desaktivéiert</string>
   <string name="xdivert_not_supported">Ëmleedung net ënnerstëtzt fir CDMA</string>
+  <string name="xdivert_status">Ëmleedungsstatus</string>
   <string name="xdivert_active">Aktiv</string>
   <string name="xdivert_not_active">Net aktiv</string>
+  <string name="ims_edit_title">IMS-Kontodetailer</string>
+  <string name="ims_accounts_title">IMS-Kont</string>
   <string name="ims_menu_save">Späicheren</string>
   <string name="ims_menu_discard">Verwerfen</string>
   <string name="remove_ims_account">Kont läschen</string>
@@ -98,6 +156,9 @@
   <string name="dial">Uruffen</string>
   <string name="enterName">Numm aginn:</string>
   <string name="enterNumber">Telefonsnummer aginn:</string>
+  <string name="set_sub_1">SIM-Kaart 1: </string>
+  <string name="set_sub_2">SIM-Kaart 2: </string>
+  <string name="set_sub_3">SIM-Kaart 3: </string>
   <string name="set_sub_activate_success">Aktivéierung erfollegräich</string>
   <string name="set_sub_deactivate_success">Desaktivéierung erfollegräich</string>
   <string name="set_sub_activate_failed">Aktivéierung feelgeschloen</string>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 0cb7b7246..ca808fe66 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -32,13 +32,19 @@
   <string name="manageConferenceLabel">Telefonskonferenz verwalten</string>
   <string name="ok">OK</string>
   <string name="audio_mode_speaker">Lautsprecher</string>
+  <string name="audio_mode_earpiece">Lautsprecher</string>
+  <string name="audio_mode_wired_headset">Handy-Kopfhörer</string>
   <string name="audio_mode_bluetooth">Bluetooth</string>
+  <string name="wait_prompt_str">Dës Téin schécken?\n</string>
   <string name="pause_prompt_str">Téin gi geschéckt\n</string>
   <string name="send_button">Schécken</string>
   <string name="pause_prompt_yes">Jo</string>
   <string name="pause_prompt_no">Nee</string>
   <string name="wild_prompt_str">Plazhalter ersetzen duerch</string>
+  <string name="no_vm_number">Mailbox-Nummer feelt</string>
+  <string name="no_vm_number_msg">Op der SIM-Kaart ass keng Mailbox-Nummer gespäichert.</string>
   <string name="add_vm_number_str">Nummer dobäisetzen</string>
+  <string name="puk_unlocked">Deng SIM-Kaart gouf entspaart. Däin Telefon gëtt elo entspaart\u2026</string>
   <string name="label_ndp">PIN fir d\'Entspärung vum SIM-Netzwierk</string>
   <string name="sim_ndp_unlock_text">Entspären</string>
   <string name="sim_ndp_dismiss_text">Verwerfen</string>
@@ -47,14 +53,27 @@
   <string name="unlock_success">Netzwierkentspärung erfollegräich.</string>
   <string name="labelGSMMore">GSM-Uruffastellungen</string>
   <string name="labelCDMAMore">CDMA-Uruffastellungen</string>
+  <string name="apn_settings">Zougangspunkten (APNen)</string>
   <string name="settings_label">Netzwierkastellungen</string>
   <string name="voicemail">Sproochopnam</string>
+  <string name="voicemail_abbreviated">AB:</string>
+  <string name="networks">Netzwierkprovideren</string>
   <string name="call_settings">Uruffastellungen</string>
   <string name="additional_gsm_call_settings">Zousätzlech Astellungen</string>
+  <string name="sum_gsm_call_settings">Zousätzlech Astellunge fir Uriff just iwwer GSM</string>
+  <string name="additional_cdma_call_settings">Zousätzlech Astellunge fir Uriff iwwer CDMA</string>
+  <string name="sum_cdma_call_settings">Zousätzlech Astellunge fir Uriff just iwwer CDMA</string>
+  <string name="labelNwService">Netzwierk-Service-Astellungen</string>
   <string name="labelCallerId">Uruffer-ID</string>
+  <string name="sum_loading_settings">Astellunge gi gelueden\u2026</string>
   <string name="sum_hide_caller_id">Nummer bei erausgoenden Uriff verstoppt</string>
   <string name="sum_show_caller_id">Nummer bei erausgoenden Uriff ugewisen</string>
+  <string name="sum_default_caller_id">Astellunge fir d\'Uweise vun der Nummer bei erausgoenden Uriff vum Provider iwwerhuelen</string>
   <string name="labelCW">Gespréich pauséiert</string>
+  <string name="sum_cw_enabled">Mech während engem Gespréich iwwer erakommend Uriff informéieren</string>
+  <string name="sum_cw_disabled">Mech während engem Gespréich iwwer erakommend Uriff informéieren</string>
+  <string name="call_forwarding_settings">Astellunge fir d\'Gespréich-Weiderleedung</string>
+  <string name="labelCF">Gespréich-Weiderleedung</string>
   <string name="labelCFU">Ëmmer weiderleeden</string>
   <string name="messageCFU">Ëmmer dës Nummer benotzen</string>
   <string name="sum_cfu_enabled_indicator">Weiderleedung fir all d\'Uriff</string>
@@ -63,17 +82,28 @@
   <string name="sum_cfu_disabled">Desaktivéiert</string>
   <string name="labelCFB">Weiderleede wa besat</string>
   <string name="messageCFB">Nummer wa besat</string>
+  <string name="sum_cfb_enabled">Weiderleeden u(n) <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
   <string name="sum_cfb_disabled">Desaktivéiert</string>
   <string name="disable_cfb_forbidden">Däi Provider erlaabt et net d\'Weiderleedung auszeschalte wann deng Nummer besat ass.</string>
   <string name="labelCFNRy">Weiderleede wann net beäntwert</string>
   <string name="messageCFNRy">Nummer wann net beäntwert</string>
+  <string name="sum_cfnry_enabled">Weiderleeden u(n) <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
   <string name="sum_cfnry_disabled">Desaktivéiert</string>
   <string name="disable_cfnry_forbidden">Däi Provider erlaabt et net d\'Weiderleedung auszeschalte wann s du den Uruff net beäntwers.</string>
+  <string name="labelCFNRc">Weiderleede wann net erreechbar</string>
+  <string name="messageCFNRc">Nummer wann net erreechbar</string>
+  <string name="sum_cfnrc_enabled">Weiderleeden u(n) <xliff:g id="phonenumber" example="555-1212">{0}</xliff:g></string>
   <string name="sum_cfnrc_disabled">Desaktivéiert</string>
+  <string name="disable_cfnrc_forbidden">Däin Netzbedreiwer ënnerstëtzt d\'Desaktivéiere vun der Uruffweiderleedungen bei Onerreechbarkeet net.</string>
   <string name="updating_title">Uruffastellungen</string>
   <string name="error_updating_title">Feeler bei den Uruffastellungen</string>
   <string name="reading_settings">Astellunge gi gelies\u2026</string>
   <string name="updating_settings">Astellunge ginn aktualiséiert\u2026</string>
+  <string name="reverting_settings">Astellunge ginn zréckgesat\u2026</string>
+  <string name="response_error">Onerwaart Äntwert vum Netzwierk.</string>
+  <string name="exception_error">Netzwierk- oder SIM-Kaartefeeler.</string>
+  <string name="fdn_check_failure">D\'Funktioun fir zougeloosse Ruffnummeren ass an denger Telefonsapp ugeschalt. Doduerch kënne verschidde Funktiounen déi mat Telefonéieren ze dinn hunn net benotzt ginn.</string>
+  <string name="radio_off_error">Aktivéier deng Mobilfunkconnectioun, iers de dës Astellungen uweis.</string>
   <string name="close_dialog">OK</string>
   <string name="enable">Aktivéieren</string>
   <string name="disable">Desaktivéieren</string>
@@ -83,6 +113,9 @@
     <item>Nummer verstoppen</item>
     <item>Nummer uweisen</item>
   </string-array>
+  <string name="vm_changed">Mailbox-Nummer geännert.</string>
+  <string name="vm_change_failed">Konnt d\'Mailboxnummer net änneren.\nKontaktéier däin Netzbedreiwer wann de Problem bestoe bleift.</string>
+  <string name="fw_change_failed">Konnt d\'Weiderleedungsnummer net änneren.\nKontaktéier däin Netzbedreiwer wann de Problem bestoe bleift.</string>
   <string name="fw_get_in_vm_failed">Déi aktuell Astellunge fir d\'Weiderleedungsnummer kënnen net ofgeruff a gespäichert ginn.\nWëlls du trotzdeem bei deen anere Provider wiesselen?</string>
   <string name="no_change">Keng Ännerunge goufe gemaach.</string>
   <string name="sum_voicemail_choose_provider">Mailbox-Service auswielen</string>
@@ -93,11 +126,17 @@
   <string name="empty_networks_list">Keng Netzwierker fonnt.</string>
   <string name="search_networks">Netzwierker sichen</string>
   <string name="network_query_error">Feeler beim Sichen no Netzwierker.</string>
+  <string name="register_on_network">Umellung bei <xliff:g id="network">%s</xliff:g>\u2026</string>
+  <string name="not_allowed">Deng SIM-Kaart erlaabt keng Connectioun mat dësem Netzwierk.</string>
+  <string name="connect_later">Ka momentan keng Connectioun mat dësem Netzwierk hierstellen. Probéier méi spéit nees.</string>
   <string name="registration_done">Um Netzwierk ugemellt.</string>
+  <string name="sum_carrier_select">Netzwierk-Provider auswielen</string>
+  <string name="sum_search_networks">All verfügbar Netzwierker sichen</string>
   <string name="select_automatically">Automatesch auswielen</string>
   <string name="sum_select_automatically">Automatesch dat preferréiert Netzwierk auswielen</string>
   <string name="register_automatically">Automatesch Registréierung\u2026</string>
   <string name="preferred_network_mode_title">Preferéierten Netzwierktyp</string>
+  <string name="preferred_network_mode_summary">De Modus vun der Netzwierkoperatioun änneren</string>
   <string name="preferred_network_mode_dialogtitle">Preferéierten Netzwierktyp</string>
   <string name="preferred_network_mode_wcdma_perf_summary">Preferéierten Netzwierktyp: WCDMA preferéiert</string>
   <string name="preferred_network_mode_gsm_only_summary">Preferéierten Netzwierktyp: just GSM</string>
@@ -130,14 +169,32 @@
   </string-array>
   <string name="data_enabled">Daten aktivéiert</string>
   <string name="data_enable_summary">Datenzougrëff iwwer dat mobilt Netzwierk aktivéieren</string>
+  <string name="roaming">Dateroaming</string>
   <string name="roaming_enable">Beim Roaming d\'Connectioun mat Dateservicer zouloossen</string>
   <string name="roaming_disable">Beim Roaming d\'Connectioun mat Dateservicer zouloossen</string>
+  <string name="roaming_reenable_message">D\'Dateconnectioun gouf ënnerbrach, well s du däin Heemnetzwierk verlooss hues an Dateroaming net aktivéiert ass.</string>
+  <string name="roaming_warning">Dateroaming erlaben? Doduerch kënnen héich Käschten entstoen!</string>
   <string name="gsm_umts_options">GSM/UMTS-Optiounen</string>
   <string name="cdma_options">CDMA-Optiounen</string>
   <string name="throttle_data_usage">Dateverbrauch</string>
   <string name="throttle_current_usage">Daten an der aktueller Period genotzt</string>
+  <string name="throttle_time_frame">Datennotzungsperiod</string>
   <string name="throttle_rate">Richtlinn fir den Datentaux</string>
   <string name="throttle_help">Méi gewuer ginn</string>
+  <string name="throttle_status_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) vu(n) <xliff:g id="used">%3$s</xliff:g> Maximum fir dës Period\nDéi nächst Period start a(n) <xliff:g id="used">%4$d</xliff:g> Deeg (<xliff:g id="used">%5$s</xliff:g>)</string>
+  <string name="throttle_data_usage_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) vu(n) <xliff:g id="used">%3$s</xliff:g> Maximum fir dës Period</string>
+  <string name="throttle_data_rate_reduced_subtext"><xliff:g id="used">%1$s</xliff:g> Maximum iwwerschratt\nDen Datentaux gouf op <xliff:g id="used">%2$d</xliff:g> kb/s reduzéiert</string>
+  <string name="throttle_time_frame_subtext"><xliff:g id="used">%1$d</xliff:g>\u066A vum Zyklus ofgelaf\nDéi nächst Period start a(n) <xliff:g id="used">%2$d</xliff:g> Deeg (<xliff:g id="used">%3$s</xliff:g>)</string>
+  <string name="throttle_rate_subtext">Den Datentaux gëtt op <xliff:g id="used">%1$d</xliff:g> kb/s reduzéiert wann d\'Datennotzungslimitt iwwerschratt ass</string>
+  <string name="throttle_help_subtext">Méi Informatiounen iwwer d\'Richtlinne vum Netzbedreiwer fir d\'Notzung vun de Mobilfunknetzdaten</string>
+  <string name="cell_broadcast_sms">Zell-Iwwerdroungs-SMS</string>
+  <string name="enable_disable_cell_bc_sms">Zell-Iwwerdroungs-SMS</string>
+  <string name="cell_bc_sms_enable">Zell-Iwwerdroungs-SMS aktivéiert</string>
+  <string name="cell_bc_sms_disable">Zell-Iwwerdroungs-SMS desaktivéiert</string>
+  <string name="cb_sms_settings">Zell-Iwwerdroungs-SMS-Astellungen</string>
+  <string name="enable_disable_emergency_broadcast">Noutruff-Iwwerdoung</string>
+  <string name="emergency_broadcast_enable">Noutruff-Iwwerdoung aktivéiert</string>
+  <string name="emergency_broadcast_disable">Noutruff-Iwwerdoung desaktivéiert</string>
   <string name="enable_disable_administrative">Verwaltung</string>
   <string name="administrative_enable">Verwaltung aktivéiert</string>
   <string name="administrative_disable">Verwaltung desaktivéiert</string>
@@ -158,7 +215,10 @@
   <string name="national_enable">National Noriichten aktivéiert</string>
   <string name="national_disable">National Noriichten desaktivéiert</string>
   <string name="enable_disable_international">International</string>
+  <string name="international_enable">International Noriichten aktivéiert</string>
+  <string name="international_disable">International Noriichten desaktivéiert</string>
   <string name="list_language_title">Sprooch</string>
+  <string name="list_language_summary">Wiel d\'Noriichte-Sprooch</string>
   <string-array name="list_language_entries">
     <item>Emglesch</item>
     <item>Franséisch</item>
@@ -181,19 +241,44 @@
   <string name="enable_disable_local_weather">Lokaalt Wieder</string>
   <string name="local_weather_enable">Lokaalt Wieder aktivéiert</string>
   <string name="local_weather_disable">Lokaalt Wieder desaktivéiert</string>
+  <string name="enable_disable_atr">Regional Trafficnoriichten</string>
+  <string name="atr_enable">Regional Trafficnoriichten aktivéiert</string>
+  <string name="atr_disable">Regional Trafficnoriichten desaktivéiert</string>
+  <string name="enable_disable_lafs">Fluchzäite vu lokale Fluchhäfen</string>
+  <string name="lafs_enable">Fluchzäite vu lokale Fluchhäfen aktivéiert</string>
+  <string name="lafs_disable">Fluchzäite vu lokale Fluchhäfen desaktivéiert</string>
   <string name="enable_disable_restaurants">Restauranten</string>
   <string name="restaurants_enable">Restauranten aktivéiert</string>
   <string name="restaurants_disable">Restauranten desaktivéiert</string>
+  <string name="enable_disable_lodgings">Hébergementer</string>
+  <string name="lodgings_enable">Hébergementer aktivéiert</string>
+  <string name="lodgings_disable">Hébergementer desaktivéiert</string>
+  <string name="enable_disable_retail_directory">Handelsverzeechnës</string>
+  <string name="retail_directory_enable">Handelsverzeechnës aktivéiert</string>
+  <string name="retail_directory_disable">Handelsverzeechnës desaktivéiert</string>
   <string name="enable_disable_advertisements">Reklammen</string>
   <string name="advertisements_enable">Reklammen aktivéiert</string>
   <string name="advertisements_disable">Reklammen desaktivéiert</string>
   <string name="enable_disable_stock_quotes">Boursennotéierungen</string>
   <string name="stock_quotes_enable">Boursennotéierungen aktivéiert</string>
   <string name="stock_quotes_disable">Boursennotéierungen desaktivéiert</string>
+  <string name="enable_disable_eo">Fräi Aarbechtsplazen</string>
+  <string name="eo_enable">Fräi Aarbechtsplazen aktivéiert</string>
+  <string name="eo_disable">Fräi Aarbechtsplazen desaktivéiert</string>
+  <string name="enable_disable_mhh">Medezin, Gesondheet a Spideeler</string>
+  <string name="mhh_enable">Medezin, Gesondheet a Spideeler aktivéiert</string>
+  <string name="mhh_disable">Medezin, Gesondheet a Spideeler desaktivéiert</string>
+  <string name="enable_disable_technology_news">Technologie-Neiegkeeten</string>
+  <string name="technology_news_enable">Technologie-Neiegkeeten aktivéiert</string>
+  <string name="technology_news_disable">Technologie-Neiegkeeten desaktivéiert</string>
+  <string name="enable_disable_multi_category">Méi Rubriken</string>
+  <string name="multi_category_enable">Méi Rubriken aktivéiert</string>
+  <string name="multi_category_disable">Méi Rubriken desaktivéiert</string>
   <string name="network_lte">LTE (recommandéiert)</string>
   <string name="network_4G">4G (recommandéiert)</string>
   <string name="network_global">Global</string>
   <string name="cdma_system_select_title">Auswiel duerch de System</string>
+  <string name="cdma_system_select_summary">Den CDMA-Roamingmodus änneren</string>
   <string name="cdma_system_select_dialogtitle">Auswiel duerch de System</string>
   <string-array name="cdma_system_select_choices">
     <item>Just Doheem</item>
@@ -212,15 +297,26 @@
   </string-array>
   <string name="cdma_activate_device">Apparat aktivéieren</string>
   <string name="cdma_lte_data_service">Dateservice astellen</string>
+  <string name="carrier_settings_title">Netzbedreiwerastellungen</string>
+  <string name="fdn">Zougeloosse Ruffnummeren</string>
   <string name="manage_fdn_list">Uruffbegrenzung</string>
   <string name="fdn_activation">FDN-Aktivéierung</string>
+  <string name="fdn_enabled">Zougeloosse Ruffnummere sinn aktivéiert</string>
+  <string name="fdn_disabled">Zougeloosse Ruffnummere sinn desaktivéiert</string>
   <string name="enable_fdn">FDN aktivéieren</string>
   <string name="disable_fdn">FDN desaktivéieren</string>
   <string name="change_pin2">PIN2 änneren</string>
   <string name="enable_fdn_ok">FDN desaktivéieren</string>
   <string name="disable_fdn_ok">FDN aktivéieren</string>
+  <string name="sum_fdn">Zougeloosse Ruffnummere geréieren</string>
+  <string name="sum_fdn_change_pin">PIN fir den Zougrëff op déi zougeloosse Ruffnummeren änneren</string>
+  <string name="sum_fdn_manage_list">Nummerelëscht geréieren</string>
+  <string name="voice_privacy">Stëmm-Privatsphär</string>
+  <string name="voice_privacy_summary">Erweidert Privatsphär aktivéieren</string>
   <string name="tty_mode_option_title">TTY-Modus</string>
   <string name="tty_mode_option_summary">TTY-Modus setzen</string>
+  <string name="auto_retry_mode_title">Automatesch nei probéieren</string>
+  <string name="auto_retry_mode_summary">Modus fir automatesch nei ze probéieren aktivéieren</string>
   <string name="menu_add">Kontakt dobäisetzen</string>
   <string name="menu_edit">Kontakt änneren</string>
   <string name="menu_delete">Kontakt läschen</string>
@@ -228,13 +324,31 @@
   <string name="name">Numm</string>
   <string name="number">Nummer</string>
   <string name="save">Späicheren</string>
+  <string name="add_fdn_contact">Zougeloosse Ruffnummer dobäigesat</string>
+  <string name="adding_fdn_contact">Zougeloosse Ruffnummer gëtt dobäigesat\u2026</string>
+  <string name="fdn_contact_added">Zougeloosse Ruffnummer dobäigesat.</string>
+  <string name="edit_fdn_contact">Zougeloosse Ruffnummer änneren</string>
+  <string name="updating_fdn_contact">Zougeloosse Ruffnummer gëtt aktualiséiert\u2026</string>
+  <string name="fdn_contact_updated">Zougeloosse Ruffnummer aktualiséiert.</string>
+  <string name="delete_fdn_contact">Zougeloosse Ruffnummer läschen</string>
+  <string name="deleting_fdn_contact">Zougeloosse Ruffnummer gëtt geläscht\u2026</string>
+  <string name="fdn_contact_deleted">Zougeloosse Ruffnummer geläscht.</string>
+  <string name="pin2_invalid">FDN gouf net aktualiséiert well s du eng inkorrekt PIN aginn hues.</string>
+  <string name="fdn_invalid_number">FDN gouf net aktualiséiert well d\'Nummer net iwwer 20 Ziffere laang ka sinn.</string>
+  <string name="pin2_or_fdn_invalid">FDN gouf net aktualiséiert. D\'PIN2 war inkorrekt oder d\'Telefonsnummer gouf refuséiert.</string>
   <string name="fdn_failed">FDN-Operatioun feelgeschloen.</string>
+  <string name="simContacts_emptyLoading">Liese vun der SIM-Kaart\u2026</string>
+  <string name="simContacts_empty">Keng Kontakter op der SIM-Kaart.</string>
+  <string name="simContacts_title">Kontakter fir z\'importéiere auswielen</string>
+  <string name="simContacts_airplaneMode">Fir Kontakter vun der SIM-Kaart z\'importéieren muss du fir d\'éischt de Fliigermodus ausschalten.</string>
   <string name="enable_pin">SIM-PIN aktivéieren/desaktivéieren</string>
   <string name="change_pin">SIM-PIN änneren</string>
   <string name="enter_pin_text">SIM-PIN:</string>
   <string name="oldPinLabel">Al PIN</string>
   <string name="newPinLabel">Nei PIN</string>
   <string name="confirmPinLabel">Nei PIN bestätegen</string>
+  <string name="badPin">Den ale PIN deen s de aginn hues ass net korrekt. Probéier nees.</string>
+  <string name="mismatchPin">D\'PIN-Coden déi s de aginn hues stëmmen net iwwereneen. Probéier nees.</string>
   <string name="invalidPin">Tipp e PIN deen tëscht 4 an 8 Zifferen huet.</string>
   <string name="disable_sim_pin">SIM-PIN desaktivéieren</string>
   <string name="enable_sim_pin">SIM-PIN aktivéieren</string>
@@ -243,23 +357,41 @@
   <string name="disable_pin_ok">SIM-PIN desaktivéiert.</string>
   <string name="pin_failed">De PIN deen s de aginn hues ass net korrekt.</string>
   <string name="pin_changed">SIM-PIN erfollegräich geännert.</string>
+  <string name="puk_requested">Passwuert inkorrekt, PIN blockéiert! PUK ugefrot.</string>
   <string name="enter_pin2_text">PIN2</string>
   <string name="oldPin2Label">Al PIN2</string>
   <string name="newPin2Label">Nei PIN2</string>
   <string name="confirmPin2Label">Nei PIN2 bestätegen</string>
+  <string name="badPuk2">De PUK2 deen s du aginn hues ass net korrekt. Probéier nees.</string>
+  <string name="badPin2">Den ale PIN2 deen s de aginn hues ass net korrekt. Probéier nees.</string>
+  <string name="mismatchPin2">D\'PIN2-Coden déi s de aginn hues stëmmen net iwwereneen. Probéier nees.</string>
+  <string name="invalidPin2">Tipp e PIN2 deen tëscht 4 an 8 Zifferen huet.</string>
   <string name="invalidPuk2">Gëff e PUK2 vun 8 Zifferen an.</string>
   <string name="pin2_changed">PIN2 erfollegräich geännert.</string>
   <string name="label_puk2_code">PUK2-Code aginn</string>
+  <string name="fdn_enable_puk2_requested">Passwuert net korrekt, d\'PIN2 ass blockéiert. Änner w.e.g. de PIN2 a probéier nees!</string>
+  <string name="puk2_requested">Passwuert net korrekt, d\'SIM ass blockéiert. PUK2 néideg.</string>
   <string name="puk2_blocked">D\'PUK2 ass permanent blockéiert.</string>
+  <string name="pin2_attempts">\nEt bleiwen nach <xliff:g id="number">%d</xliff:g> Versich.</string>
+  <string name="pin2_unblocked">PIN2 deblockéiert!</string>
+  <string name="doneButton">Fäerdeg</string>
+  <string name="caller_manage_header">Konferenzuruff <xliff:g id="conf_call_time">%s</xliff:g></string>
+  <string name="voicemail_settings_number_label">Mailbox-Nummer</string>
   <string name="card_title_dialing">Gëtt gewielt</string>
+  <string name="card_title_redialing">Gëtt nees probéiert</string>
+  <string name="card_title_conf_call">Konferenzuruff</string>
+  <string name="card_title_incoming_call">Erakommenden Uruff</string>
   <string name="card_title_call_ended">Uruff ofgeschloss</string>
   <string name="card_title_on_hold">Gehalen</string>
   <string name="card_title_hanging_up">Uruff gëtt getrennt</string>
+  <string name="card_title_in_call">An engem Gespréich</string>
   <string name="card_title_my_phone_number">Meng Nummer ass <xliff:g id="my_phone_number">%s</xliff:g></string>
   <string name="notification_dialing">Gëtt gewielt</string>
   <string name="notification_missedCallTitle">Verpassten Uruff</string>
   <string name="notification_missedCallsTitle">Verpasst Uriff</string>
+  <string name="notification_missedCallsMsg"><xliff:g id="num_missed_calls">%s</xliff:g> verpasst Uriff</string>
   <string name="notification_missedCallTicker">Verpassten Uruff vu(n) <xliff:g id="missed_call_from">%s</xliff:g></string>
+  <string name="notification_ongoing_call">Uruff am Gaang</string>
   <string name="notification_on_hold">Gehalen</string>
   <string name="notification_incoming_call">Erakommenden Uruff</string>
   <string name="notification_voicemail_title">Nei Mailbox-Opnam</string>
@@ -284,6 +416,7 @@
   <string name="incall_error_supp_service_conference">Keng Telefonskonferenz méiglech.</string>
   <string name="incall_error_supp_service_reject">Uruff kann net refuséiert ginn.</string>
   <string name="incall_error_supp_service_hangup">Uriff kënnen net fräigi ginn.</string>
+  <string name="incall_call_type_label_sip">Internet-Uruff</string>
   <string name="emergency_enable_radio_dialog_title">Noutruff</string>
   <string name="emergency_enable_radio_dialog_message">Mobilfunkverbindung gëtt aktivéiert\u2026</string>
   <string name="emergency_enable_radio_dialog_retry">Plaz ouni Netzofdeckung; gëtt nees probéiert\u2026</string>
@@ -296,6 +429,7 @@
   <string name="onscreenMuteText">Stomm</string>
   <string name="onscreenAddCallText">Uruff dobäisetzen</string>
   <string name="onscreenMergeCallsText">Uriff verbannen</string>
+  <string name="onscreenSwapCallsText">Auswiesselen</string>
   <string name="onscreenManageCallsText">Uriff geréieren</string>
   <string name="onscreenManageConferenceText">Konferenz geréieren</string>
   <string name="onscreenAudioText">Toun</string>
@@ -305,6 +439,7 @@
   <string name="importingSimContacts">SIM-Kontakter ginn importéiert</string>
   <string name="importToFDNfromContacts">Aus de Kontakter importéieren</string>
   <string name="hac_mode_title">Héierapparater</string>
+  <string name="hac_mode_summary">Kompatilitéit mat Héierapparater uschalten</string>
   <string-array name="tty_mode_entries">
     <item>TTY Aus</item>
     <item>TTY Voll</item>
@@ -312,49 +447,144 @@
     <item>TTY VCO</item>
   </string-array>
   <string name="dtmf_tones_title">DTMF-Téin</string>
+  <string name="dtmf_tones_summary">D\'Längt vun den DTMF-Téin definéieren</string>
   <string-array name="dtmf_tone_entries">
     <item>Normal</item>
     <item>Laang</item>
   </string-array>
+  <string name="network_message">Netzwierkmessage</string>
   <string name="ota_title_activate">Däin Telefon aktivéieren</string>
+  <string name="ota_touch_activate">E speziellen Uruff muss gemaach gi fir den Telefonsservice ze aktivéieren.\n\nNom drécken op \u201CAktivéieren\u201D muss du d\'Uleedunge suivéiere fir däin Telefon ze aktivéieren.</string>
+  <string name="ota_hfa_activation_title">Gëtt aktivéiert...</string>
+  <string name="ota_hfa_activation_dialog_message">Däin Telefon aktivéiert däi mobilen Dateservice.\n\nDat ka bis zu 5 Minutten daueren.</string>
   <string name="ota_skip_activation_dialog_title">Aktivéierung iwwersprangen\?</string>
+  <string name="ota_skip_activation_dialog_message">Wann s du d\'Aktivéierung iwwerspréngs, kanns du keng Uriff ofsetzen oder dech mam mobilen Datennetzwierk connectéieren (mat WLAN-Netzwierker bleift et awer méiglech). Bis de däin Telefon aktivéiers hues, gëss de all Kéier gefrot en ze aktivéiere wann s de en uschalts. </string>
   <string name="ota_skip_activation_dialog_skip_label">Iwwersprangen</string>
   <string name="ota_activate">Aktivéieren</string>
   <string name="ota_title_activate_success">Den Telefon ass aktivéiert.</string>
   <string name="ota_title_problem_with_activation">Problem bei der Aktivéierung</string>
+  <string name="ota_listen">Suivéiert déi geschwaten Uleedung bis de héiers dass d\'Aktivéierung ofgeschloss ass.</string>
   <string name="ota_speaker">Lautsprecher</string>
   <string name="ota_progress">Waart während däin Telefon programméiert gëtt.</string>
   <string name="ota_failure">Programméierung feelgeschloen</string>
+  <string name="ota_successful">Däin Telefon ass elo aktivéiert. Et ka bis zu 15 Minutten dauere bis d\'Servicer gestart sinn.</string>
+  <string name="ota_unsuccessful">Däin Telefon gouf net aktivéiert.\nDu muss eng Plaz mat besserem Empfang fannen (z.B. bei enger Fënster oder dobaussen).\n\nProbéier nees oder ruff fir aner Optioune beim Clientsservice un.</string>
+  <string name="ota_spc_failure">IWWERMÉISSEG VILL SPC-FEELER</string>
   <string name="ota_call_end">Zréck</string>
+  <string name="ota_try_again">Nees probéieren</string>
   <string name="ota_next">Weider</string>
   <string name="ecm_exit_dialog">EcmExitDialog</string>
   <string name="phone_entered_ecm_text">Noutfallréckruffmodus aktivéiert</string>
   <string name="phone_in_ecm_notification_title">Noutfallréckruffmodus</string>
   <string name="phone_in_ecm_call_notification_text">Dateconnectioun desaktivéiert</string>
+  <plurals name="phone_in_ecm_notification_time">
+    <item quantity="one">Keng Date-Connectioun fir <xliff:g id="count">%s</xliff:g> Minutt</item>
+    <item quantity="other">Keng Date-Connectioun fir <xliff:g id="count">%s</xliff:g> Minutten</item>
+  </plurals>
+  <plurals name="alert_dialog_exit_ecm">
+    <item quantity="one">Däin Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutt am Noutfallréckruffmodus. An dësem Modus kënne keng Appen eng Dateconnectioun benotzen. Wëlls du en elo verloossen?</item>
+    <item quantity="other">Däin Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutten am Noutfallréckruffmodus. An dësem Modus kënne keng Appen eng Dateconnectioun benotzen. Wëlls du en elo verloossen?</item>
+  </plurals>
+  <plurals name="alert_dialog_not_avaialble_in_ecm">
+    <item quantity="one">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel. Den Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutt an dësem Modus. Wëlls du en elo verloossen?</item>
+    <item quantity="other">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel. Den Telefon befënnt sech fir <xliff:g id="count">%s</xliff:g> Minutten an dësem Modus. Wëlls du en elo verloossen?</item>
+  </plurals>
+  <string name="alert_dialog_in_ecm_call">Déi ausgewielten Aktioun ass am Noutfallréckruffmodus net disponibel.</string>
+  <string name="progress_dialog_exiting_ecm">Noutfallréckruffmodus gëtt verlooss</string>
   <string name="alert_dialog_yes">Jo</string>
   <string name="alert_dialog_no">Nee</string>
+  <string name="alert_dialog_dismiss">Verwerfen</string>
   <string name="voicemail_provider">Service</string>
+  <string name="voicemail_settings">Astellen</string>
+  <string name="voicemail_number_not_set">&lt;Net definéiert&gt;</string>
+  <string name="other_settings">Aner Uruff-Astellungen</string>
   <string name="calling_via_template">Uruff iwwer <xliff:g id="provider_name">%s</xliff:g></string>
   <string name="contactPhoto">Kontaktfoto</string>
   <string name="goPrivate">privat schwätzen</string>
+  <string name="selectContact">Kontakt auswielen</string>
+  <string name="sip_settings">Astellunge fir Interneturiff</string>
+  <string name="sip_accounts">Konte fir Interneturiff (SIP)</string>
   <string name="sip_accounts_title">Konten</string>
+  <string name="sip_receive_calls">Uriff empfänken</string>
+  <string name="sip_receive_calls_summary">Reduzéiert d\'Akkulafzäit</string>
+  <string name="sip_call_options_title">Interneturiff (SIP) benotzen</string>
+  <string name="sip_call_options_wifi_only_title">Interneturiff (SIP) benotzen (just WLAN)</string>
+  <string name="sip_call_options_entry_1">Fir all d\'Uriff wann en Datennetzwierk disponibel ass</string>
+  <string name="sip_call_options_entry_2">Just fir Internet-Uriff</string>
+  <string name="sip_call_options_entry_3">Bei all Uruff froen</string>
+  <string name="sip_call_options_wifi_only_entry_1">Fir all Uruff</string>
+  <string name="pick_outgoing_call_phone_type">Uruff aleeden</string>
+  <string name="pick_outgoing_sip_phone">Internet-Uruffkont benotzen:</string>
+  <string name="remember_my_choice">Ëmmer bei Interneturiff benotzen</string>
+  <string name="reset_my_choice_hint">Du kanns ënner Telefon &gt; Astellungen &gt; Interneturuffastellungen &gt; Konten ännere wéi een Interneturuffkont standardméisseg benotzt soll ginn.</string>
+  <string name="pstn_phone">per Telefon</string>
+  <string name="internet_phone">per Internet</string>
+  <string name="no_sip_account_found_title">Kee Kont fir Internet-Uriff</string>
+  <string name="no_sip_account_found">Et si keng Konte fir Internet-Uriff op dësem Telefon. Wëlls du elo een dobäisetzen?</string>
   <string name="sip_menu_add">Dobäisetzen</string>
+  <string name="add_sip_account">Kont dobäisetzen</string>
+  <string name="remove_sip_account">Kont läschen</string>
+  <string name="sip_account_list">SIP-Konten</string>
+  <string name="saving_account">Kont gëtt gespäichert\u2026</string>
+  <string name="removing_account">Kont gëtt geläscht\u2026</string>
   <string name="sip_menu_save">Späicheren</string>
   <string name="sip_menu_discard">Verwerfen</string>
   <string name="alert_dialog_close">Profil zoumaachen</string>
   <string name="alert_dialog_ok">OK</string>
   <string name="close_profile">Zoumaachen</string>
+  <string name="primary_account_summary_with">Haaptkont. <xliff:g id="registration_status" example="Registering...">%s</xliff:g></string>
   <string name="registration_status_checking_status">Status gëtt iwwerpréift...</string>
+  <string name="registration_status_registering">Registréierung\u2026</string>
+  <string name="registration_status_still_trying">Registréierung leeft nach\u2026</string>
+  <string name="registration_status_not_receiving">Uriff ginn net empfaangen.</string>
+  <string name="registration_status_no_data">D\'Konteregistréierung gouf gestoppt well keng Internetconnectioun besteet.</string>
+  <string name="registration_status_no_wifi_data">D\'Konteregistréierung gouf gestoppt well keng WLAN-Connectioun besteet.</string>
+  <string name="registration_status_not_running">Konteregistréierung feelgeschloen.</string>
+  <string name="registration_status_done">Uriff ginn empfaangen.</string>
+  <string name="registration_status_failed_try_later">Konteregistréierung feelgeschloen: (<xliff:g id="registration_error_message" example="timed out">%s</xliff:g>); ech probéiere méi spéit nees</string>
+  <string name="registration_status_invalid_credentials">Konteregistréierung feelgeschloen: Falsche Benotzernumm oder falscht Passwuert.</string>
+  <string name="registration_status_server_unreachable">Account registration unsuccessful: Kontrolléier de Servernumm.</string>
+  <string name="third_party_account_summary">Dëse Kont gëtt momentan vun der App \"<xliff:g id="account_owner" example="Google Talk">%s</xliff:g>\" benotzt.</string>
+  <string name="sip_edit_title">Detailer vum SIP-Konto</string>
+  <string name="sip_edit_new_title">Detailer vum SIP-Kont</string>
   <string name="domain_address_title">Server</string>
   <string name="username_title">Benotzernumm</string>
   <string name="password_title">Passwuert</string>
   <string name="display_name_title">Ugewisenen Numm</string>
+  <string name="proxy_address_title">Erausgoend Proxy-Adress</string>
+  <string name="port_title">Port-Nummer</string>
+  <string name="transport_title">Transporttyp</string>
+  <string name="send_keepalive_title">\"Keep-alive\" schécken</string>
+  <string name="set_primary_title">Als Standard-Konto setzen</string>
+  <string name="set_primary_summary">Fir erausgoend Uriff benotzt</string>
+  <string name="advanced_settings">Optional Astellungen</string>
+  <string name="auth_username_title">Authentifizéierungs-Benotzernumm</string>
+  <string name="auth_username_summary">Benotzernumm dee fir d\'Authentifizéierung benotzt gëtt</string>
+  <string name="default_preference_summary">&lt;Net definéiert&gt;</string>
+  <string name="display_name_summary">&lt;Identesch mam Benotzernumm&gt;</string>
+  <string name="optional_summary">&lt;Optional&gt;</string>
   <string name="advanced_settings_show">▷ Drécke fir alles unzeweisen</string>
   <string name="advanced_settings_hide">▽ Drécke fir alles ze verstoppen</string>
+  <string name="empty_alert"><xliff:g id="input_field_name" example="Username, Password...">%s</xliff:g> gëtt benéidegt a kann net eidel bleiwen.</string>
+  <string name="not_a_valid_port">D\'Port-Nummer sollt tëscht 1000 an 65534 sinn.</string>
+  <string name="no_internet_available_title">Keng Internet-Connectioun</string>
+  <string name="no_wifi_available_title">Keng WLAN-Connectioun</string>
+  <string name="no_internet_available">Kontrolléier deng Internetconnectioun ier s de en Interneturuff ofsetz.</string>
+  <string name="no_wifi_available">Fir Interneturiff ass eng aktiv Connectioun mat engem WLAN-Netzwierkt néideg. (benotz d\'Astellungen ënner \"Kabbellos an Netzwierk\").</string>
+  <string name="no_voip">Interneturiff net ënnerstëtzt</string>
   <string translatable="true" name="sip_system_decide">Automatesch</string>
   <string translatable="true" name="sip_always_send_keepalive">Ëmmer schécken</string>
+  <string name="not_voice_capable">Stëmm-Uriff net ënnerstëtzt</string>
+  <string name="respond_via_sms_canned_response_1">Kann elo net schwätzen. Ëm wat geet et?</string>
+  <string name="respond_via_sms_canned_response_2">Ech ruffe geschwënn zréck.</string>
+  <string name="respond_via_sms_canned_response_3">Ech ruffe méi spéit zréck.</string>
+  <string name="respond_via_sms_canned_response_4">Kann elo net schwätzen. Telefonéiere mer méi spéit?</string>
+  <string name="respond_via_sms_custom_message">Eegen Äntwert...</string>
   <string name="respond_via_sms_setting_title">Séier Äntwerten</string>
   <string name="respond_via_sms_setting_title_2">Séier Äntwerten änneren</string>
+  <string name="respond_via_sms_edittext_dialog_title">Séier Äntwert</string>
+  <string name="respond_via_sms_menu_reset_default_activity">Virgaben zrécksetzen</string>
+  <string name="respond_via_sms_confirmation_format">Message geschéckt un <xliff:g id="phone_number">%s</xliff:g>.</string>
   <string name="description_image_button_one">een</string>
   <string name="description_image_button_two">zwee</string>
   <string name="description_image_button_three">dräi</string>
@@ -369,6 +599,7 @@
   <string name="description_image_button_pound">Pond</string>
   <string name="description_dial_button">wielen</string>
   <string name="description_delete_button">Récktast</string>
+  <string name="accessibility_speakerphone_enabled">Lautsprecher aktivéiert.</string>
   <string name="accessibility_call_muted">Uruff stomm geschalt.</string>
   <string name="description_target_answer">Äntweren</string>
   <string name="description_target_send_sms">SMS schécken</string>
@@ -376,10 +607,10 @@
   <string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">Vibréieren</string>
   <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">Vibréieren</string>
   <string name="voicemail_notification_ringtone_title">Toun</string>
+  <string name="default_notification_description">Standardtoun (<xliff:g id="default_sound_title">%1$s</xliff:g>)</string>
   <string name="ringtone_title" msgid="5379026328015343686">Schelltoun</string>
   <string name="vibrate_on_ring_title">Vibréiere beim Schellen</string>
   <string name="dtmf_tone_enable_title">Wieltastentéin</string>
   <string name="dial_pad_autocomplete">Autovervollst. fir Wieltasten</string>
   <string name="preference_category_ringtone">Schelltoun a Vibratioun</string>
-  <string name="call_settings_title_font_family">sans-serif-light</string>
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 3ed18a226..ee5110024 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Duomenų paslaugos turi būti laikinai atjungtos. Ar tikrai norite tęsti?</string>
   <string name="simContacts_title_cm">Valdyti SIM kortelės kontaktus</string>
   <string name="sip_accounts_title_cm">SIP paskyros</string>
+  <string name="respond_via_sms_cannot_be_empty">Greitas atsakas negali būti tuščias</string>
+  <string name="call_recording_format">Skambučio įrašymo formatas</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 64b26229d..f688e07a7 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Datatjeneste må frakobles midlertidig. Er du sikker på at du vil fortsette?</string>
   <string name="simContacts_title_cm">Administrere SIM-kortkontakter</string>
   <string name="sip_accounts_title_cm">SIP-kontoer</string>
+  <string name="respond_via_sms_cannot_be_empty">Rask respons kan ikke være tom</string>
+  <string name="call_recording_format">Opptaksformat ved samtale</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index b01e092b4..54d258e05 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Gegevensverbinding moet tijdelijk worden verbroken. Weet u zeker dat u wilt doorgaan?</string>
   <string name="simContacts_title_cm">Contacten op simkaart beheren</string>
   <string name="sip_accounts_title_cm">SIP-accounts</string>
+  <string name="respond_via_sms_cannot_be_empty">Snel antwoord kan niet leeg zijn</string>
+  <string name="call_recording_format">Formaat gespreksopname</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 83f3a5e15..48238f66c 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -80,7 +80,10 @@
   <string name="choose_forward_lookup_provider_title">Dostawca wyszukiwania naprzód</string>
   <string name="choose_people_lookup_provider_title">Dostawca wyszukiwania osób</string>
   <string name="choose_reverse_lookup_provider_title">Dostawca wyszukiwania wstecz</string>
+  <string name="sim_name">Nazwa SIM</string>
   <string name="sub_no_sim">Brak karty SIM</string>
+  <string name="sub_active">Aktywna</string>
+  <string name="sub_not_active">Nieaktywna</string>
   <string name="msim_call_selector_title">Zadzwoń <xliff:g id="number">%s</xliff:g> poprzez</string>
   <string name="msim_call_selector_item">SIM<xliff:g id="index">%1$d</xliff:g>: <xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn Chiński (CN)</string>
@@ -198,15 +201,23 @@
   <string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">Preferowany tryb sieci: TD-SCDMA/GSM/WCDMA/LTE</string>
   <string name="preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma_summary">Preferowany tryb sieci: TD-SCDMA/LTE/CDMA/EvDo/GSM/WCDMA</string>
   <string name="preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma_summary">Preferowany tryb sieci: TD-SCDMA/CDMA/EvDo/GSM/WCDMA</string>
+  <string name="network_settings_sel_sub">Ustawienia karty SIM</string>
+  <string name="summary_manage_subscriptions">Zarządzanie ustawieniami sieci każdej karty SIM</string>
+  <string name="callind_multi_sim">Ustawienia karty SIM</string>
   <string name="tty_mode_not_allowed_vt_call">Zmiana trybu TTY jest niedozwolona podczas rozmowy wideo</string>
   <string name="fdn_service_unavailable">Usługa FDN jest niedostępna.</string>
   <string name="exportContacts">Eksportowanie kontaktów do karty SIM\u2026</string>
   <string name="xdivert_summary">Ustawienia CFNRc</string>
   <string name="phone_numbers">Wprowadź numery telefonów</string>
+  <string name="sub1LineNumber">Numer SIM 1:</string>
+  <string name="sub2LineNumber">Numer SIM 2:</string>
   <string name="proceed">Kontynuuj</string>
   <string name="sum_xdivert_enabled">Przekierowanie połączeń włączone</string>
   <string name="sum_xdivert_disabled">Przekierowanie połączeń wyłączone</string>
   <string name="xdivert_not_supported">Przekierowania nie są obsługiwane przez CDMA</string>
+  <string name="xdivert_enternumber_error">Wprowadź numer telefonu dla każdej karty SIM</string>
+  <string name="xdivert_partial_set">X-Divert zostało ustawione tylko dla pierwszej karty SIM</string>
+  <string name="xdivert_sub_absent">Każda karta SIM powinna być aktywowana do procesu X-Divert</string>
   <string name="xdivert_status">Status przekazywania</string>
   <string name="xdivert_active">Aktywny</string>
   <string name="xdivert_not_active">Nieaktywny</string>
@@ -249,9 +260,14 @@
   <string name="exportAllcontatsFailed">Nie udało się wyeksportować kontaktów na kartę SIM</string>
   <string name="exportAllcontatsNoContacts">Nie odnaleziono kontaktów do wyeksportowania na kartę SIM</string>
   <string name="cursorError">Nieprawidłowy typ danych</string>
+  <string name="set_subscription">Konfigurowanie kart SIM</string>
+  <string name="set_subscription_error_atleast_one">Wybierz co najmniej jedną kartę SIM</string>
   <string name="set_uicc_subscription_progress">Ustawianie usługi\u2026</string>
   <string name="set_sub_success">Usługa została ustawiona pomyślnie</string>
   <string name="set_sub_failed">Nie udało się ustawić usługi</string>
+  <string name="set_sub_1">Karta SIM 1: </string>
+  <string name="set_sub_2">Karta SIM 2: </string>
+  <string name="set_sub_3">Karta SIM 3: </string>
   <string name="set_sub_activate_success">Aktywacja pomyślna</string>
   <string name="set_sub_deactivate_success">Dezaktywacja pomyślna</string>
   <string name="set_sub_activate_failed">Aktywacja nie powiodła się</string>
@@ -268,4 +284,6 @@
   <string name="disconnect_data_confirm">Usługa danych mobilnych musi zostać chwilowo wyłączona. Czy chcesz kontynuować?</string>
   <string name="simContacts_title_cm">Zarządzanie kontaktami karty SIM</string>
   <string name="sip_accounts_title_cm">Konta SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Szybka odpowiedź nie może być pusta</string>
+  <string name="call_recording_format">Format nagrywania rozmowy</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 227f53c06..ece0ca926 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">O serviço de dados tem de ser desligado temporariamente. Tem a certeza que deseja continuar?</string>
   <string name="simContacts_title_cm">Gerenciar contatos do cartão SIM</string>
   <string name="sip_accounts_title_cm">Contas SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">A resposta rápida não pode estar vazia</string>
+  <string name="call_recording_format">Formato de gravação de chamada</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 043318b35..c0678bac4 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">O serviço de dados tem de ser desligado temporariamente. Tem a certeza que deseja continuar?</string>
   <string name="simContacts_title_cm">Gerir os contactos do cartão SIM</string>
   <string name="sip_accounts_title_cm">Contas SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Resposta rápida não pode estar vazia</string>
+  <string name="call_recording_format">Formato de gravação de chamada</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 0fe9e7625..77e2e4900 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -33,7 +33,7 @@
   <string name="call_notif_callconnectedect">Apel conectat printr-un transfer de apel explicit</string>
   <string name="incall_vibration">Vibrare în momentul apelului</string>
   <string name="vibrate_outgoing">Vibrare când se răspunde</string>
-  <string name="vibrate_call_waiting">Vibrare pentru apel în așteptare</string>
+  <string name="vibrate_call_waiting">Vibrare la apel în așteptare</string>
   <string name="vibrate_hangup">Vibrare la închidere apel</string>
   <string name="vibrate_45">Vibrare la fiecare minut</string>
   <string name="vibrate_45_sum">Vibrare la fiecare 45 secunde din minut în timpul convorbirilor</string>
@@ -80,14 +80,175 @@
   <string name="choose_forward_lookup_provider_title">Transmite furnizorul de căutare</string>
   <string name="choose_people_lookup_provider_title">Furnizorul de căutare a persoanelor</string>
   <string name="choose_reverse_lookup_provider_title">Furnizorul de căutare inversă</string>
+  <string name="sim_name">Numele de SIM</string>
   <string name="sub_no_sim">Niciun SIM</string>
+  <string name="sub_active">Activ</string>
+  <string name="sub_not_active">Inactiv</string>
   <string name="msim_call_selector_title">Apelează <xliff:g id="number">%s</xliff:g> prin</string>
   <string name="msim_call_selector_item">SIM<xliff:g id="index">%1$d</xliff:g>: <xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn Chineză (CN)</string>
   <string name="preference_category_t9_dialpad_search">Căutare Dialpad T9</string>
   <string name="t9_search_input_locale">Căutare T9</string>
-  <string name="t9_search_input_locale_default">Implcit</string>
+  <string name="t9_search_input_locale_default">Implicit</string>
   <string name="incoming_call_style_title">Stilul ecranului unui apel în desfășurare</string>
   <string name="incoming_call_style_classic">Clasic</string>
   <string name="incoming_call_style_fullscreen_photo">Fotografia apelantului pe tot ecranul</string>
+  <string name="network_forbidden">(Interzis)</string>
+  <string name="proximity_mode_title">Activare senzor de proximitate</string>
+  <string name="proximity_on_summary">În timpul unui apel, utilizaţi senzorul de proximitate pentru a opri ecranul</string>
+  <string name="proximity_off_summary">În timpul unui apel, ecranul va rămâne pornit</string>
+  <string name="call_barring">Blocare apel</string>
+  <string name="call_barring_off">Oprit</string>
+  <string name="call_barring_outgoing">Blocare de apel extern</string>
+  <string name="call_barring_outgoing_international_roaming">Apeluri Internaționale în roaming</string>
+  <string name="call_barring_outgoing_international">Apeluri internaţionale</string>
+  <string name="call_barring_outgoing_all">Toate apelurile efectuate</string>
+  <string name="call_barring_incoming">Blocare apel primit</string>
+  <string name="call_barring_incoming_roaming">În timpul roaming-ului</string>
+  <string name="call_barring_incoming_all">Toate apelurile primite</string>
+  <string name="input_password">Introduceţi parola</string>
+  <string name="psw_enter_old">Parola curentă</string>
+  <string name="labelCbChangePassword">Schimbă parola</string>
+  <string name="psw_enter_new">Noua parolă</string>
+  <string name="invalidPsw">Introduceți parola (4-8 cifre)</string>
+  <string name="psw_reenter_new">Confirmare parolă nouă</string>
+  <string name="cb_psw_dont_match">Parolele nu se potrivesc</string>
+  <string name="operation_successfully">Operațiune terminată cu succes</string>
+  <string name="emergency_call_list_title">Listă apel de urgenţă</string>
+  <string name="emergency_call">Apel</string>
+  <string name="new_emergency_number">Număr de urgențã nou</string>
+  <string name="emergency_call_number">Numărul de apel de urgenţă</string>
+  <string name="emergency_number_exist">Numărul de urgență introdus există deja.</string>
+  <string name="emergency_number_save_error">Numărul de urgență introdus este prea lung.</string>
+  <string name="ipcall_sub_title">Prefix de apelare IP</string>
+  <string name="ipcall_sub_summery">Editare prefix pentru apelare prin serviciul IP</string>
+  <string name="ipcall_dialog_title">Setările de apel IP</string>
+  <string name="ipcall_dialog_edit_hint">Prefix de apelare IP</string>
+  <string name="notification_missedVideoCallTitle">Apel video nepreluat</string>
+  <string name="notification_missedVideoCallsTitle">Apeluri video nepreluate</string>
+  <string name="notification_missedVideoCallsMsg"><xliff:g id="num_missed_calls">%1$s</xliff:g> apeluri video nepreluate</string>
+  <string name="notification_missedVideoCallTicker">Apel video nepreluat de la <xliff:g id="missed_call_from">%1$s</xliff:g></string>
+  <string name="preferred_network_mode_dialogtitle_cmcc">Mod rețea</string>
+  <string name="preferred_network_mode_4g_3g_2g_auto_summary">4G/3G/2G (auto)</string>
+  <string name="preferred_network_mode_3g_2g_auto_summary">3G/2G (auto)</string>
+  <string name="CFActivate">Activează</string>
+  <string name="CFDeactivate">Dezactivează</string>
+  <string name="labelCFDeactAll">Dezactivează toate</string>
+  <string name="uplmn_list_setting_title">Rețele preferate</string>
+  <string name="network_id">ID reţea</string>
+  <string name="dialog_network_priority_title">Prioritate</string>
+  <string name="uplmn_list_setting_add_plmn">Nou PLMN</string>
+  <string name="gsm_umts_network_preferences_title">Mod de rețea</string>
+  <string name="gsm_umts_network_preferences_dialogtitle">Mod de rețea</string>
+  <string name="label_cdp">PIN deblocare SIM corporativ</string>
+  <string name="label_spdp">PIN deblocare furnizor de servicii SIM</string>
+  <string name="label_sdp">PIN de deblocare pentru SIM</string>
+  <string name="label_rn1dp">PIN deblocare RUIM rețea 1</string>
+  <string name="label_rn2dp">PIN deblocare RUIM rețea 2</string>
+  <string name="label_rhrpd">PIN deblocare RUIM HRPD</string>
+  <string name="label_rcdp">PIN deblocare RUIM corporativ</string>
+  <string name="label_rspdp">PIN deblocare furnizor de servicii RUIM</string>
+  <string name="label_rdp">PIN deblocare RUIM</string>
+  <string name="label_puk">Introduceţi codul PUK</string>
+  <string name="requesting_sim_unlock">Se solicită deblocare SIM\u2026</string>
+  <string name="requesting_ruim_unlock">Se solicită deblocare RUIM\u2026</string>
+  <string name="requesting_puk_unlock">Se solicită deblocare PUK\u2026</string>
+  <string name="sim_unlock_failed">Cererea de deblocare pentru SIM a eșuat.</string>
+  <string name="ruim_unlock_failed">Cererea de deblocare RUIM a eșuat.</string>
+  <string name="puk_unlock_failed">Deblocarea PUK a eșuat.</string>
+  <string name="unlock_success_cm">Reţea SIM deblocată cu succes.</string>
+  <string name="sp_unlock_success">Deblocarea furnizorului de servicii SIM a reușit.</string>
+  <string name="corporate_unlock_success">Deblocarea SIM corporativ a reușit.</string>
+  <string name="sim_unlock_success">Deblocarea SIM a reușit.</string>
+  <string name="rnw1_unlock_success">Deblocarea RUIM rețea 1 a reușit.</string>
+  <string name="rnw2_unlock_success">Deblocarea RUIM rețea 2 a reușit.</string>
+  <string name="rhrpd_unlock_success">Deblocarea RUIM HRPD a reușit.</string>
+  <string name="rsp_unlock_success">Deblocarea furnizorului de servicii RUIM a reușit.</string>
+  <string name="rc_unlock_success">Deblocarea RUIM corporativ a reușit.</string>
+  <string name="ruim_unlock_success">Deblocarea RUIM a reușit.</string>
+  <string name="puk_unlock_success">Deblocarea PUK a reușit.</string>
+  <string name="stk_cc_ss_to_dial_error">Cererea SS este modificată în cerere APEL.</string>
+  <string name="stk_cc_ss_to_ussd_error">Cererea SS este modificată în cerere USSD.</string>
+  <string name="stk_cc_ss_to_ss_error">Cererea SS este modificată într-o cerere SS nouă.</string>
+  <string name="preferred_network_mode_global_summary_cm">Mod rețea preferat: Global (CDMA/EvDo/LTE/GSM/WCDMA)</string>
+  <string name="preferred_network_mode_td_scdma_only_summary">Mod rețea preferat: doar TD-SCDMA</string>
+  <string name="preferred_network_mode_td_scdma_wcdma_summary">Mod rețea preferat: TD-SCDMA/WCDMA</string>
+  <string name="preferred_network_mode_td_scdma_lte_summary">Mod rețea preferat: TD-SCDMA/LTE</string>
+  <string name="preferred_network_mode_td_scdma_gsm_summary">Mod rețea preferat: TD-SCDMA/GSM</string>
+  <string name="preferred_network_mode_td_scdma_gsm_lte_summary">Mod rețea preferat: TD-SCDMA/GSM/LTE</string>
+  <string name="preferred_network_mode_td_scdma_gsm_wcdma_summary">Mod rețea preferat: TD-SCDMA/GSM/WCDMA</string>
+  <string name="preferred_network_mode_td_scdma_wcdma_lte_summary">Mod rețea preferat: TD-SCDMA/WCDMA/LTE</string>
+  <string name="preferred_network_mode_td_scdma_gsm_wcdma_lte_summary">Mod rețea preferat: TD-SCDMA/GSM/WCDMA/LTE</string>
+  <string name="preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma_summary">Mod rețea preferat: TD-SCDMA/LTE/CDMA/EvDo/GSM/WCDMA</string>
+  <string name="preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma_summary">Mod rețea preferat: TD-SCDMA/CDMA/EvDo/GSM/WCDMA</string>
+  <string name="network_settings_sel_sub">Setări cartelă SIM</string>
+  <string name="callind_multi_sim">Setări cartelă SIM</string>
+  <string name="fdn_service_unavailable">Serviciul FDN nu este disponibil.</string>
+  <string name="exportContacts">Se exportă contactele în cardul SIM\u2026</string>
+  <string name="xdivert_summary">Setări CFNRc</string>
+  <string name="phone_numbers">Introduceţi numerele de telefon</string>
+  <string name="sub1LineNumber">Număr SIM 1:</string>
+  <string name="sub2LineNumber">Număr SIM 2:</string>
+  <string name="proceed">Continuă</string>
+  <string name="sum_xdivert_enabled">Redirecționare-X activat</string>
+  <string name="sum_xdivert_disabled">Redirecționare-X dezactivat</string>
+  <string name="xdivert_enternumber_error">Introduceţi numărul de telefon pentru fiecare cartelă SIM</string>
+  <string name="xdivert_status">Stare Redirecționare-X</string>
+  <string name="xdivert_active">Activ</string>
+  <string name="xdivert_not_active">Inactiv</string>
+  <string name="no_volte">Nu pot efectua apeluri IMS</string>
+  <string name="ims_edit_title">Detalii cont IMS</string>
+  <string name="ims_accounts_title">Cont IMS</string>
+  <string name="mo_call_type_title">Tipul apelului MO</string>
+  <string name="ims_service_capability_title">Capacitatea serviciului IMS</string>
+  <string name="ims_menu_save">Salvare</string>
+  <string name="ims_menu_discard">Anulare</string>
+  <string name="remove_ims_account">Elimină cont</string>
+  <string name="ims_vt_call_quality_title">Calitate apel video</string>
+  <string name="ims_vt_call_quality_low">Joasă</string>
+  <string name="ims_vt_call_quality_high">Înaltă</string>
+  <string name="ims_vt_call_quality_unknown">Necunoscut</string>
+  <string name="ims_vt_call_quality_set_failed">Setarea calității video nu a reușit</string>
+  <string name="contactScreen">Gestionare contacte SIM</string>
+  <string name="exportContactScreen">Exportaţi contactele din telefon în SIM</string>
+  <string name="addSimEntries">Adăugare contact în SIM</string>
+  <string name="deleteAllSimEntries">Şterge toate contactele din SIM</string>
+  <string name="deleteSimContacts">Se șterg contactele din SIM\u2026</string>
+  <string name="editContact">Editaţi</string>
+  <string name="sendSms">Trimite SMS</string>
+  <string name="delete">Ștergeți</string>
+  <string name="dial">Apelare</string>
+  <string name="enterName">Introduceţi numele:</string>
+  <string name="enterNumber">Introduceți un număr de telefon:</string>
+  <string name="contactAddSuccess">Contactul a fost adăugat cu succes pe SIM</string>
+  <string name="contactAddFailed">Adăugarea contactului în SIM a eșuat</string>
+  <string name="contactUpdateSuccess">Contactul a fost actualizat cu succes în SIM</string>
+  <string name="contactUpdateFailed">Actualizarea contactului în SIM a eșuat</string>
+  <string name="contactdeleteSuccess">S-a reușit ștergerea contactului din SIM</string>
+  <string name="contactdeleteFailed">Nu s-a reușit ștergerea contactului din SIM</string>
+  <string name="allContactdeleteSuccess">S-a reușit ștergerea tuturor contactelor din SIM</string>
+  <string name="allContactdeleteFailed">Nu s-a reușit ștergerea tuturor contactelor din SIM</string>
+  <string name="exportAllcontatsSuccess">S-a reușit exportarea tuturor contactelor în SIM</string>
+  <string name="exportAllcontatsFailed">Nu s-a reușit exportarea tuturor contactelor în SIM</string>
+  <string name="cursorError">Date cursor incorecte</string>
+  <string name="set_subscription_error_atleast_one">Selectaţi cel puţin o cartelă SIM</string>
+  <string name="set_sub_success">Setarea abonamentului a reușit</string>
+  <string name="set_sub_failed">Setarea abonamentului a eșuat</string>
+  <string name="set_sub_1">Cartela SIM 1: </string>
+  <string name="set_sub_2">Cartela SIM 2: </string>
+  <string name="set_sub_3">Cartela SIM 3: </string>
+  <string name="set_sub_activate_success">Activare cu succes</string>
+  <string name="set_sub_deactivate_success">Dezactivare cu succes</string>
+  <string name="set_sub_activate_failed">Activare eșuată</string>
+  <string name="set_sub_global_activate_failed">Activare globală eșuată</string>
+  <string name="set_sub_global_deactivate_failed">Dezactivare globală eșuată</string>
+  <string name="set_sub_deactivate_failed">Dezactivarea a eșuat</string>
+  <string name="set_sub_activate_not_supported">Activarea nu este acceptată</string>
+  <string name="set_sub_deactivate_not_supported">Dezactivarea nu este acceptată</string>
+  <string name="set_sub_no_change">Abonamentul nu a suferit nici o schimbare</string>
+  <string name="deact_all_sub_not_supported">Dezactivarea tuturor abonamentelor nu este acceptată.</string>
+  <string name="set_sub_not_supported_phone_in_call">Activarea sau dezactivarea abonamentelor nu este permisă în timpul unui apel.</string>
+  <string name="sip_accounts_title_cm">Conturi SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Răspunsul rapid nu poate fi gol</string>
+  <string name="call_recording_format">Formatul de înregistrare a apelului</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 477c8c49c..30fe885a2 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Мобильный интернет будет временно отключён. Продолжить?</string>
   <string name="simContacts_title_cm">Управление контактами SIM-карты</string>
   <string name="sip_accounts_title_cm">SIP-аккаунты</string>
+  <string name="respond_via_sms_cannot_be_empty">Текст быстрого ответа не может быть пустым</string>
+  <string name="call_recording_format">Формат записи вызова</string>
 </resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index d09d94102..9d40ee06e 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -18,7 +18,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="call_notif_unconditionalCF">කොන්දේසි විරහිතව ඇමතුම් ඉදිරියට යැවීම සක්‍රීයයි</string>
-  <string name="call_notif_conditionalCF">කොන්දේසිගතව ඇමතුම් ඉදිරියට යැවීම සක්‍රීයයි</string>
+  <string name="call_notif_conditionalCF">කොන්දේසිමය ඇමතුම් යොමු කිරීම සක්‍රීයයි</string>
   <string name="call_notif_MOcall_forwarding">ලබාගන්නා ඇමතුම ඉදිරියට යැවුනි</string>
   <string name="call_notif_cugcall">සංවෘත පරිශීලක සමූහය තුල ඇමතුම</string>
   <string name="call_notif_outgoing_barred">ලබාගන්නා ඇමතුම් වළක්වා ඇත</string>
@@ -129,12 +129,12 @@
   <string name="notification_missedVideoCallsMsg">මඟහැරුණු වීඩියෝ ඇමතුම් <xliff:g id="num_missed_calls">%1$s</xliff:g></string>
   <string name="notification_missedVideoCallTicker"><xliff:g id="missed_call_from">%1$s</xliff:g> වෙතින් වීඩියෝ ඇමතුමක් මගහැරුණි</string>
   <string name="preferred_network_mode_dialogtitle_cmcc">ජාල ප්‍රකාරය</string>
-  <string name="preferred_network_mode_4g_3g_2g_auto_summary">4G/3G/2G (ස්වයංක්‍රීය)</string>
-  <string name="preferred_network_mode_3g_2g_auto_summary">3G/2G (ස්වයංක්‍රීය)</string>
+  <string name="preferred_network_mode_4g_3g_2g_auto_summary">4G/3G/2G (ස්වයං)</string>
+  <string name="preferred_network_mode_3g_2g_auto_summary">3G/2G (ස්වයං)</string>
   <string name="CFActivate">සක්‍රීය කරන්න</string>
   <string name="CFDeactivate">අක්‍රීය කරන්න</string>
   <string name="labelCFDeactAll">සියල්ල අක්‍රීය කරන්න</string>
-  <string name="uplmn_list_setting_title">වඩා කැමති ජාල</string>
+  <string name="uplmn_list_setting_title">අභිමත ජාල</string>
   <string name="network_id">ජාල අනන්‍යකාරකය</string>
   <string name="dialog_network_priority_title">ප්‍රමුඛතාව</string>
   <string name="uplmn_list_setting_add_plmn">අලුත් PLMN</string>
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">දත්ත සේවාව තාවකාලිකව විසන්ධි කිරීමට අවශ්‍යවේ. ඔබට ඉදිරියට යාමට අවශ්‍ය බවට විශ්වාසද?</string>
   <string name="simContacts_title_cm">සිම්පත් සම්බන්ධතා කළමනාකරණය</string>
   <string name="sip_accounts_title_cm">SIP ගිණුම්</string>
+  <string name="respond_via_sms_cannot_be_empty">යුහු ප්‍රතිචාරය හිස් නොවිය යුතුය</string>
+  <string name="call_recording_format">ඇමතුම් පටිගතකරණ ආකෘතිය</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 82a3626fa..872364623 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Dátová služba musí byť dočasne odpojená. Ste si istý, že chcete pokračovať?</string>
   <string name="simContacts_title_cm">Spravovať kontakty na karte SIM</string>
   <string name="sip_accounts_title_cm">SIP účty</string>
+  <string name="respond_via_sms_cannot_be_empty">Rýchla odpoveď nemôže byť prázdny</string>
+  <string name="call_recording_format">Formát nahrávky hovoru</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index e1d3e303f..e6b7633a2 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Услуга мобилних података треба привремено да се прекине. Да ли си сигуран да желиш да наставиш?</string>
   <string name="simContacts_title_cm">Управљај контактима са SIM картице</string>
   <string name="sip_accounts_title_cm">SIP налози</string>
+  <string name="respond_via_sms_cannot_be_empty">Брзи одговор не може бити празан</string>
+  <string name="call_recording_format">Формат снимања позива</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 384a62c6d..69465fcea 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -80,6 +80,7 @@
   <string name="choose_people_lookup_provider_title">Leverantör för personsökning</string>
   <string name="choose_reverse_lookup_provider_title">Leverantör för omvänd sökning</string>
   <string name="sub_no_sim">Inget SIM</string>
+  <string name="sub_active">Aktiv</string>
   <string name="msim_call_selector_title">Ring <xliff:g id="number">%s</xliff:g> via</string>
   <string name="msim_call_selector_item">SIM<xliff:g id="index">%1$d</xliff:g>: <xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn Kinesiska (CN)</string>
@@ -89,8 +90,68 @@
   <string name="incoming_call_style_title">Skärmstil för inkommande samtal</string>
   <string name="incoming_call_style_classic">Klassisk</string>
   <string name="incoming_call_style_fullscreen_photo">Kontaktbild i helskärm</string>
+  <string name="network_forbidden">(Förbjudet)</string>
+  <string name="call_barring">Samtalsspärr</string>
+  <string name="call_barring_off">Av</string>
+  <string name="call_barring_outgoing_all">Alla utgående samtal</string>
+  <string name="call_barring_incoming_all">Alla inkommande samtal</string>
+  <string name="input_password">Ange lösenord</string>
+  <string name="psw_enter_old">Nuvarande lösenord</string>
+  <string name="labelCbChangePassword">Byt lösenord</string>
+  <string name="psw_enter_new">Nytt lösenord</string>
+  <string name="invalidPsw">Ange ditt lösenord (4 - 8 tecken)</string>
+  <string name="psw_reenter_new">Bekräfta nytt lösenord</string>
+  <string name="cb_psw_dont_match">Lösenordet matchar ej</string>
+  <string name="emergency_call_list_title">Nödsamtalslista</string>
+  <string name="emergency_call">Ring</string>
+  <string name="new_emergency_number">Nytt nödsamtalsnummer</string>
+  <string name="emergency_call_number">Nödsamtalsnummer</string>
+  <string name="ipcall_dialog_title">IP-samtalsinställningar</string>
+  <string name="notification_missedVideoCallTitle">Missat videosamtal</string>
+  <string name="notification_missedVideoCallsTitle">Missade videosamtal</string>
+  <string name="notification_missedVideoCallsMsg"><xliff:g id="num_missed_calls">%1$s</xliff:g> missade videosamtal</string>
+  <string name="notification_missedVideoCallTicker">Missat videosamtal från <xliff:g id="missed_call_from">%1$s</xliff:g></string>
+  <string name="preferred_network_mode_dialogtitle_cmcc">Nätverksläge</string>
+  <string name="preferred_network_mode_4g_3g_2g_auto_summary">4G/3G/2G (auto)</string>
+  <string name="preferred_network_mode_3g_2g_auto_summary">3G/2G (auto)</string>
+  <string name="CFActivate">Aktivera</string>
+  <string name="CFDeactivate">Inaktivera</string>
+  <string name="labelCFDeactAll">Inaktivera alla</string>
+  <string name="network_id">Nätverks-ID</string>
+  <string name="dialog_network_priority_title">Prioritet</string>
+  <string name="gsm_umts_network_preferences_title">Nätverksläge</string>
+  <string name="gsm_umts_network_preferences_dialogtitle">Nätverksläge</string>
   <string name="label_puk">Ange PUK</string>
+  <string name="phone_numbers">Ange telefonnummer</string>
+  <string name="sub1LineNumber">SIM 1 nummer:</string>
+  <string name="sub2LineNumber">SIM 2 nummer:</string>
+  <string name="proceed">Fortsätt</string>
+  <string name="xdivert_active">Aktiv</string>
+  <string name="xdivert_not_active">Inaktiv</string>
   <string name="ims_menu_save">Spara</string>
   <string name="ims_menu_discard">Avbryt</string>
+  <string name="remove_ims_account">Ta bort konto</string>
+  <string name="ims_vt_call_quality_title">Videosamtalskvalitet</string>
+  <string name="ims_vt_call_quality_low">Låg</string>
+  <string name="ims_vt_call_quality_high">Hög</string>
+  <string name="ims_vt_call_quality_unknown">Okänd</string>
+  <string name="ims_vt_call_quality_set_failed">Kunde inte ställa in videokvalitet</string>
+  <string name="contactScreen">Hantera SIM-kontakter</string>
+  <string name="exportContactScreen">Exportera telefonkontakter till SIM</string>
+  <string name="addSimEntries">Lägg till SIM-kontakt</string>
+  <string name="deleteAllSimEntries">Ta bort alla SIM-kontakter</string>
+  <string name="deleteSimContacts">Tar bort SIM-kontakter\u2026</string>
+  <string name="editContact">Redigera</string>
+  <string name="sendSms">Skicka SMS</string>
   <string name="delete">Ta bort</string>
+  <string name="dial">Ring</string>
+  <string name="enterName">Ange namn:</string>
+  <string name="enterNumber">Ange telefonnummer:</string>
+  <string name="set_sub_activate_success">Aktivering lyckades</string>
+  <string name="set_sub_deactivate_success">Inaktivering lyckades</string>
+  <string name="set_sub_activate_failed">Aktivering misslyckades</string>
+  <string name="set_sub_global_activate_failed">Global aktivering misslyckades</string>
+  <string name="set_sub_global_deactivate_failed">Global inaktivering misslyckades</string>
+  <string name="set_sub_deactivate_failed">Inaktivering misslyckades</string>
+  <string name="sip_accounts_title_cm">SIP-konton</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 3a04e4eaa..5f6fbcb10 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">จำเป็นต้องตัดการเชื่อมต่อเครือข่ายชั่วคราว คุณแน่ใจว่าจะทำต่อ?</string>
   <string name="simContacts_title_cm">จัดการรายชื่อในซิมการ์ด</string>
   <string name="sip_accounts_title_cm">บัญชี SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">การตอบสนองรวดเร็วต้องไม่ว่างเปล่า</string>
+  <string name="call_recording_format">นามสกุลไฟล์บันทึการโทร</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index c6d506e32..a03e8bae7 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Veri servisi bağlantısının geçici olarak kesilmesi gerekmekte. Devam etmek istediğinize emin misiniz?</string>
   <string name="simContacts_title_cm">SIM kart kişilerini yönet</string>
   <string name="sip_accounts_title_cm">SIP hesapları</string>
+  <string name="respond_via_sms_cannot_be_empty">Hızlı yanıt boş olamaz</string>
+  <string name="call_recording_format">Çağrı kayıt biçimi</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 35746acaa..ce9e91b19 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">Служба даних тимчасово буде відключена. Справді продовжити?</string>
   <string name="simContacts_title_cm">Керувати контактами SIM-карти</string>
   <string name="sip_accounts_title_cm">Облікові записи SIP</string>
+  <string name="respond_via_sms_cannot_be_empty">Швидка відповідь не може бути пустою</string>
+  <string name="call_recording_format">Формат запису виклику</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 658f18f4a..8db339d14 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -284,4 +284,6 @@
   <string name="disconnect_data_confirm">需要暂时断开数据服务连接。您确定要继续吗？</string>
   <string name="simContacts_title_cm">管理 SIM 卡联系人</string>
   <string name="sip_accounts_title_cm">SIP 帐户</string>
+  <string name="respond_via_sms_cannot_be_empty">快速回应不能为空白</string>
+  <string name="call_recording_format">通话录音格式</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 21708a0b9..0f2c2721d 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -28,10 +28,12 @@
   <string name="blacklist_call_notification_unknown_number">已阻擋來自 %s 的不明號碼來電</string>
   <string name="blacklist_notification_list_private">私人</string>
   <string name="noise_suppression_summary">通話時啟用噪音抑制</string>
+  <string name="preferred_network_mode_global">全球</string>
   <string name="enable_forward_lookup_summary">在撥號器中搜索時顯示附近的地點</string>
   <string name="enable_people_lookup_title">聯絡人查詢</string>
   <string name="enable_people_lookup_summary">在撥號器中搜索時，即時顯示搜索聯絡人結果</string>
   <string name="enable_reverse_lookup_summary">為未知來電號碼查詢聯絡人或地點資料</string>
+  <string name="sim_name">SIM 卡名稱</string>
   <string name="sub_no_sim">沒有 SIM 卡</string>
   <string name="msim_call_selector_item">SIM卡<xliff:g id="index">%1$d</xliff:g>：<xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn 中國（CN）</string>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 74ceea9e8..8c06ed0c7 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -180,7 +180,7 @@
         <item>"1"</item>
     </string-array>
 
-    <string-array name="call_recording_encoder_entries">
+    <string-array name="call_recording_encoder_entries" translatable="false">
         <item>@string/wb_amr_format</item>
         <item>@string/aac_format</item>
     </string-array>
diff --git a/src/com/android/phone/MSimNotificationMgr.java b/src/com/android/phone/MSimNotificationMgr.java
index 78ecc2e70..a1def8cf3 100644
--- a/src/com/android/phone/MSimNotificationMgr.java
+++ b/src/com/android/phone/MSimNotificationMgr.java
@@ -218,8 +218,6 @@ public class MSimNotificationMgr extends NotificationMgr {
             if (vibrate) {
                 notification.defaults |= Notification.DEFAULT_VIBRATE;
             }
-
-            notification.flags |= Notification.FLAG_NO_CLEAR;
             configureLedNotification(mContext, VOICEMAIL_NOTIFICATION, notification);
             mNotificationManager.notify(notificationId, notification);
         } else {