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

37 files changed, 164 insertions, 25 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 6b0b0f3f2..e76bb2067 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Sorteer volgens oproepe</string>
   <string name="menu_add_to_blacklist">Voeg tot verban lys</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> bygevoeg tot lys</string>
+  <string name="menu_delete_from_blacklist">Verwyder van swartlys</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> is verwyder van swartlys</string>
   <string name="nearby_places">Nabygeleë plekke</string>
   <string name="people">Mense</string>
   <string name="start_call_playback">Speel opname</string>
diff --git a/res/values-az/cm_plurals.xml b/res/values-az/cm_plurals.xml
index 2b2a9c25e..fd40ae554 100644
--- a/res/values-az/cm_plurals.xml
+++ b/res/values-az/cm_plurals.xml
@@ -20,4 +20,16 @@
     <item quantity="one">%d saat</item>
     <item quantity="other">%d saat</item>
   </plurals>
+  <plurals name="minute">
+    <item quantity="one">%d dəq</item>
+    <item quantity="other">%d dəq</item>
+  </plurals>
+  <plurals name="second">
+    <item quantity="one">%d san</item>
+    <item quantity="other">%d san</item>
+  </plurals>
+  <plurals name="call">
+    <item quantity="one">%d zəng</item>
+    <item quantity="other">%d zəng</item>
+  </plurals>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 869657afa..530b13f4b 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ordena per nombre de trucades</string>
   <string name="menu_add_to_blacklist">Afegeix a la llista negra</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> afegit a la llista negra</string>
+  <string name="menu_delete_from_blacklist">Esborra de la llista negra</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> s\'ha esborrat de la llista negra</string>
   <string name="nearby_places">Llocs propers</string>
   <string name="people">Persones</string>
   <string name="start_call_playback">Reprodueix gravació</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index e43554811..0187dff4d 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Řadit podle počtu hovorů</string>
   <string name="menu_add_to_blacklist">Přidat na černou listinu</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> přidáno na černou listinu</string>
+  <string name="menu_delete_from_blacklist">Odsranit z černé listiny</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> smazáno z černé listiny</string>
   <string name="nearby_places">Blízká místa</string>
   <string name="people">Lidé</string>
   <string name="start_call_playback">Přehrát záznam</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 5763e25d6..b49690e62 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Sortér på antal opkald</string>
   <string name="menu_add_to_blacklist">Føj til sortliste</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number"> %s </xliff:g> tilføjet blacklisten</string>
+  <string name="menu_delete_from_blacklist">Slet fra sortliste</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> slettet fra sortliste</string>
   <string name="nearby_places">Steder i nærheden</string>
   <string name="people">Mennesker</string>
   <string name="start_call_playback">Afspil optagelse</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index ee469ff83..30ac84d44 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Nach Anrufanzahl sortieren</string>
   <string name="menu_add_to_blacklist">Zur Sperrliste hinzufügen</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> wurde zur Sperrliste hinzugefügt</string>
+  <string name="menu_delete_from_blacklist">Von der Sperrliste entfernen</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> von der Sperrliste gelöscht</string>
   <string name="nearby_places">Orte in der Nähe</string>
   <string name="people">Personen</string>
   <string name="start_call_playback">Aufzeichnung abspielen</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 3b5404685..1a6ef1dca 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ταξινόμηση ανά αριθμό κλήσεων</string>
   <string name="menu_add_to_blacklist">Προσθήκη στη μαύρη λίστα</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> προστέθηκε στη μαύρη λίστα</string>
+  <string name="menu_delete_from_blacklist">Διαγραφή από την μαύρη λίστα</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> διαγράφηκε από τη μαύρη λίστα</string>
   <string name="nearby_places">Κοντινές τοποθεσίες</string>
   <string name="people">Άτομα</string>
   <string name="start_call_playback">Αναπαραγωγή καταγραφής</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 6fcdb92e7..b7f8f9c7e 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ordenar por núm. llamadas</string>
   <string name="menu_add_to_blacklist">Añadir a la lista negra</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> añadido a la lista negra</string>
+  <string name="menu_delete_from_blacklist">Eliminar de la lista negra</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> eliminado de la lista negra</string>
   <string name="nearby_places">Lugares cercanos</string>
   <string name="people">Personas</string>
   <string name="start_call_playback">Reproducir grabación</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 6207526c7..f5a31550e 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Järjestä puheluiden määrän mukaan</string>
   <string name="menu_add_to_blacklist">Lisää mustalle listalle</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> lisätty mustalle listalle</string>
+  <string name="menu_delete_from_blacklist">Poista mustalta listalta</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> poistettu mustalta listalta</string>
   <string name="nearby_places">Lähellä olevat sijainnit</string>
   <string name="people">Ihmiset</string>
   <string name="start_call_playback">Toista nauhoitus</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 03df74422..037ba7cf0 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Trier par nombre d\'appel</string>
   <string name="menu_add_to_blacklist">Ajouter à la liste noire</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> ajouté à la liste noire</string>
+  <string name="menu_delete_from_blacklist">Supprimer de la liste noire</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> supprimé de la liste noire</string>
   <string name="nearby_places">Lieux à proximité</string>
   <string name="people">Personnes</string>
   <string name="start_call_playback">Lire l\'enregistrement</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 243841f5a..0afd87738 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Rendezés hívások száma szerint</string>
   <string name="menu_add_to_blacklist">Hozzáadás a tiltólistához</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> hozzáadva a tiltólistához</string>
+  <string name="menu_delete_from_blacklist">Törlés a tiltólistáról</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> törölve a tiltólistáról</string>
   <string name="nearby_places">Közeli helyek</string>
   <string name="people">Emberek</string>
   <string name="start_call_playback">Felvétel lejátszása</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 9b659199e..0c9b21a1b 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -44,7 +44,9 @@
   <string name="call_stats_sort_by_duration">Urut sesuai durasi panggilan</string>
   <string name="call_stats_sort_by_count">Urut sesuai jumlah panggilan</string>
   <string name="menu_add_to_blacklist">Tambahkan ke daftar hitam</string>
-  <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> ditambahkan ke blacklist</string>
+  <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> ditambahkan ke daftar hitam</string>
+  <string name="menu_delete_from_blacklist">Hapus dari daftar hitam</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> dihapus dari daftar hitam</string>
   <string name="nearby_places">Tempat terdekat</string>
   <string name="people">Orang</string>
   <string name="start_call_playback">Putar rekaman</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index de4dc4bc1..782e35d9d 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ordina per numero</string>
   <string name="menu_add_to_blacklist">Aggiungi a blacklist</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> aggiunto in blacklist</string>
+  <string name="menu_delete_from_blacklist">Elimina dalla blacklist</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> eliminato dalla blacklist</string>
   <string name="nearby_places">Posti nelle vicinanze</string>
   <string name="people">Persone</string>
   <string name="start_call_playback">Riproduci registrazione</string>
@@ -54,7 +56,7 @@
   <string name="video_call">Videochiamata</string>
   <string name="video_call_settings">Impostazioni videochiamata</string>
   <string name="description_videocall">Videochiamata <xliff:g id="name">%1$s</xliff:g></string>
-  <string name="speed_dial_settings">Impostazioni di composizione rapida</string>
+  <string name="speed_dial_settings">Impostazioni composizione rapida</string>
   <string name="speed_dial_not_set">(non impostato)</string>
   <string name="speed_dial_replace">Sostituisci</string>
   <string name="speed_dial_delete">Elimina</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 7185b6a36..edd803ebc 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">通話回数で並べ替え</string>
   <string name="menu_add_to_blacklist">ブラックリストに追加</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g>をブラックリストに追加しました</string>
+  <string name="menu_delete_from_blacklist">ブラックリストから削除</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g>をブラックリストから削除しました</string>
   <string name="nearby_places">近くの場所</string>
   <string name="people">人物</string>
   <string name="start_call_playback">録音を再生</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 38f390833..bd03c7724 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">통화 횟수로 정렬</string>
   <string name="menu_add_to_blacklist">블랙리스트에 추가</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g>을(를) 블랙리스트에 추가했습니다</string>
+  <string name="menu_delete_from_blacklist">블랙리스트에서 삭제</string>
+  <string name="toast_deleted_from_blacklist">블랙리스트에서 <xliff:g id="number">%s</xliff:g>을(를) 삭제했습니다</string>
   <string name="nearby_places">주변 장소</string>
   <string name="people">사람</string>
   <string name="start_call_playback">녹음 재생</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index cba9d97d0..29bd0cc5f 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -16,4 +16,11 @@
 
 <resources>
     <item name="call_detail_header_photo_ratio" type="dimen" format="float">0.25</item>
+
+    <!-- Text dimensions for dialpad keys -->
+    <dimen name="dialpad_key_numbers_size">34sp</dimen>
+    <dimen name="dialpad_key_letters_size">11sp</dimen>
+    <dimen name="dialpad_key_star_pound_size">22sp</dimen>
+    <dimen name="dialpad_key_plus_size">15sp</dimen>
 </resources>
+
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 75c062146..61b0861fe 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -26,6 +26,8 @@
   <string name="call_stats_outgoing">Erausgoend: <xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_missed">Verpasst</string>
   <string name="call_stats_missed_percent">Verpasst: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_header_total">Total: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string>
+  <string name="call_stats_header_total_callsonly">Total: <xliff:g id="call_count">%s</xliff:g></string>
   <string name="call_stats_filter_from">Startdatum</string>
   <string name="call_stats_filter_to">Schlussdatum</string>
   <string name="call_stats_filter_picker_title">Zäitfënster</string>
@@ -38,5 +40,35 @@
   <string name="date_qs_lastquarter">Lescht Trimester</string>
   <string name="date_qs_lastyear">Lescht Joer</string>
   <string name="call_stats_date_filter">Zäitfënster ajustéieren</string>
+  <string name="call_stats_reset_filter">Zäitfënster zrécksetzen</string>
+  <string name="call_stats_sort_by_duration">No Gespréichsdauer zortéieren</string>
+  <string name="call_stats_sort_by_count">No Unzuel vun Uriff zortéieren</string>
   <string name="menu_add_to_blacklist">Op d\'schwaarz Lëscht setzen</string>
+  <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> op d\'schwaarz Lëscht gesat</string>
+  <string name="menu_delete_from_blacklist">Vun der schwaarzer Lëscht läschen</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> vun der schwaarzer Lëscht geläscht</string>
+  <string name="nearby_places">No Plazen</string>
+  <string name="people">Persounen</string>
+  <string name="start_call_playback">Opnam ofspillen</string>
+  <string name="stop_call_playback">Stopp</string>
+  <string name="call_playback_error_message">Konnt d\'Opnam net ofspillen</string>
+  <string name="calllog_search_hint">Uruffprotokoll duerchsichen</string>
+  <string name="video_call">Videouruff</string>
+  <string name="video_call_settings">Astellunge vum Videouruff</string>
+  <string name="description_videocall">Videouruff <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="speed_dial_settings">Astellunge fir d\'séiert Wielen</string>
+  <string name="speed_dial_not_set">(net gesat)</string>
+  <string name="speed_dial_replace">Ersetzen</string>
+  <string name="speed_dial_delete">Läschen</string>
+  <string name="speed_dial_unassigned_dialog_title">Net zougewisen Tast</string>
+  <string name="speed_dial_unassigned_dialog_message">Keng Kontakter fir d\'séiert Wiele mat der Nummerentast \'<xliff:g id="number">%s</xliff:g>\' definéiert. Wëlls du elo e Kontakt zouweisen?</string>
+  <string name="dialog_speed_dial_airplane_mode_message">"Fir d'séiert Wielen ze benotze muss de fir d'éischt de Fligermodus ausschalten."</string>
+  <string name="msim_ime_dialog_title">Apparat-Identifikatioun</string>
+  <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
+  <string name="call_log_show_all_slots">All SIMen</string>
+  <string name="yes">Jo</string>
+  <string name="no">Nee</string>
+  <string name="call_duration_active">Aktiv Dauer:</string>
+  <string name="call_duration_call_out">Gespréichsdauer:</string>
+  <string name="call_log_all_calls_header">All Uriff</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 4965f96ad..689ea1903 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -142,7 +142,6 @@
   <string name="dialog_voicemail_not_ready_message">Konfiguréier deng Mailbox ënner Menü &gt; Astellungen.</string>
   <string name="dialog_voicemail_airplane_mode_message">Schalt de Fligermodus aus fir d\'Mailbox unzeruffen.</string>
   <string name="contact_list_loading">Gëtt gelueden\u2026</string>
-  <string name="imei">IMEI</string>
   <string name="meid">MEID</string>
   <string name="simContacts_emptyLoading">Gëtt vun der SIM-Kaart gelueden\u2026</string>
   <string name="simContacts_title">Kontakter vun der SIM-Kaart</string>
@@ -151,8 +150,6 @@
   <string name="dialer_hint_find_contact">Tipp en Numm oder eng Telefonsnummer</string>
   <string name="call_log_all_title">All</string>
   <string name="call_log_missed_title">Verpasst</string>
-  <string name="call_log_activity_title_font_family">sans-serif-light</string>
-  <string name="show_all_contacts_title_font_family">sans-serif-light</string>
   <string name="recentMissed_empty">Keng rezent verpasst Uriff.</string>
   <string name="recentVoicemails_empty">Keng rezent Mailbox-Opnamen.</string>
   <string name="show_all_contacts">All d\'Kontakter uweisen</string>
@@ -164,21 +161,6 @@
   <string name="dialpad_3_number">3</string>
   <string name="dialpad_4_number">4</string>
   <string name="dialpad_5_number">5</string>
-  <string name="dialpad_6_number">6</string>
-  <string name="dialpad_7_number">7</string>
-  <string name="dialpad_8_number">8</string>
-  <string name="dialpad_9_number">9</string>
-  <string name="dialpad_star_number">*</string>
-  <string name="dialpad_pound_number">#</string>
-  <string name="dialpad_0_letters">+</string>
-  <string name="dialpad_2_letters">ABC</string>
-  <string name="dialpad_3_letters">DEF</string>
-  <string name="dialpad_4_letters">GHI</string>
-  <string name="dialpad_5_letters">JKL</string>
-  <string name="dialpad_6_letters">MNO</string>
-  <string name="dialpad_7_letters">PQRS</string>
-  <string name="dialpad_8_letters">TUV</string>
-  <string name="dialpad_9_letters">WXYZ</string>
   <string name="show_all_contacts_title">All d\'Kontakter</string>
   <string name="show_all_contacts_button_text">All d\'Kontakter</string>
   <string name="favorite_hidden">Aus de Favoritte läschen</string>
@@ -194,8 +176,4 @@
   <string name="remove_contact">Ewechhuelen</string>
   <string name="favorites_menu_speed_dial">Séiert Wielen</string>
   <string name="favorites_menu_all_contacts">ALL D\'KONTAKTER</string>
-  <string name="favorites_menu_speed_dial_font_family">sans-serif-light</string>
-  <string name="favorites_menu_all_contacts_font_family">sans-serif</string>
-  <string name="search_font_family">sans-serif</string>
-  <string name="tab_font_family">sans-serif</string>
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 39913a5ea..30249fa13 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Rikiuoti pagal skaičių</string>
   <string name="menu_add_to_blacklist">Įtraukti į juodąjį sąrašą</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> pridėtas į juodąjį sąrašą</string>
+  <string name="menu_delete_from_blacklist">Ištrinti iš juodojo sąrašo</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> ištrintas iš juodojo sąrašo</string>
   <string name="nearby_places">Artimos vietos</string>
   <string name="people">Žmonės</string>
   <string name="start_call_playback">Paleisti įrašą</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 33ffda30c..db0d5b7fc 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Sorter etter antall samtaler</string>
   <string name="menu_add_to_blacklist">Legg til i blokkeringsliste</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> er lagt til i svartelisten</string>
+  <string name="menu_delete_from_blacklist">Slett fra svarteliste</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> slettes fra svarteliste</string>
   <string name="nearby_places">Nærliggende steder</string>
   <string name="people">Folk</string>
   <string name="start_call_playback">Spill av opptak</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index fe24c240e..5e9fc7c4d 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Sorteren op gespreksaantal</string>
   <string name="menu_add_to_blacklist">Toevoegen aan zwarte lijst</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> toegevoegd aan zwarte lijst</string>
+  <string name="menu_delete_from_blacklist">Uit zwarte lijst verwijderen</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> verwijderd uit zwarte lijst</string>
   <string name="nearby_places">Nabijgelegen plaatsen</string>
   <string name="people">Mensen</string>
   <string name="start_call_playback">Opname afspelen</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index c19c16ada..87a723074 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Sortuj wg liczby połączeń</string>
   <string name="menu_add_to_blacklist">Dodaj do czarnej listy</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> dodany do czarnej listy</string>
+  <string name="menu_delete_from_blacklist">Usuń z czarnej listy</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> usunięto z czarnej listy</string>
   <string name="nearby_places">Miejsca w pobliżu</string>
   <string name="people">Ludzie</string>
   <string name="start_call_playback">Rozpocznij nagrywanie</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 3ee63060d..57fff0d48 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ordenar por quantidade de chamadas</string>
   <string name="menu_add_to_blacklist">Adicionar à lista de bloqueio</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> adicionado à lista negra</string>
+  <string name="menu_delete_from_blacklist">Excluir da lista negra</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> foi excluído da lista negra</string>
   <string name="nearby_places">Locais próximos</string>
   <string name="people">Pessoas</string>
   <string name="start_call_playback">Reproduzir a gravação</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index a75a49e8b..84f2d6429 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Ordenar pelo número de chamadas</string>
   <string name="menu_add_to_blacklist">Adicionar à lista negra</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> adicionado à lista negra</string>
+  <string name="menu_delete_from_blacklist">Eliminar da lista negra</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> eliminado da lista negra</string>
   <string name="nearby_places">Locais próximos</string>
   <string name="people">Pessoas</string>
   <string name="start_call_playback">Reproduzir a gravação</string>
diff --git a/res/values-ro/cm_plurals.xml b/res/values-ro/cm_plurals.xml
index 1cdbf461c..0847d94a9 100644
--- a/res/values-ro/cm_plurals.xml
+++ b/res/values-ro/cm_plurals.xml
@@ -21,4 +21,19 @@
     <item quantity="few">%d ore</item>
     <item quantity="other">%d de ore</item>
   </plurals>
+  <plurals name="minute">
+    <item quantity="one">%d min</item>
+    <item quantity="few">%d min</item>
+    <item quantity="other">%d min</item>
+  </plurals>
+  <plurals name="second">
+    <item quantity="one">%d sec</item>
+    <item quantity="few">%d sec</item>
+    <item quantity="other">%d sec</item>
+  </plurals>
+  <plurals name="call">
+    <item quantity="one">%d apel</item>
+    <item quantity="few">%d apeluri</item>
+    <item quantity="other">%d apeluri</item>
+  </plurals>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 1e754223e..794617bdf 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -45,9 +45,30 @@
   <string name="call_stats_sort_by_count">Sortare după numărul de apeluri</string>
   <string name="menu_add_to_blacklist">Adaugă la lista neagră</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number"> %s </xliff:g> adăugat la lista neagră</string>
+  <string name="menu_delete_from_blacklist">Ştergeţi din lista neagră</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> eliminat din lista neagră</string>
   <string name="nearby_places">Locații în apropiere</string>
   <string name="people">Oameni</string>
   <string name="start_call_playback">Redă înregistrarea</string>
   <string name="stop_call_playback">Stop</string>
   <string name="call_playback_error_message">Nu s-a reuşit să se redea înregistrarea</string>
+  <string name="calllog_search_hint">Căutare în jurnalul de apeluri</string>
+  <string name="video_call">Apel video</string>
+  <string name="video_call_settings">Setări apel video</string>
+  <string name="description_videocall">Apel video <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="speed_dial_settings">Setări apelare rapidă</string>
+  <string name="speed_dial_not_set">(nu este setată)</string>
+  <string name="speed_dial_replace">Înlocuire</string>
+  <string name="speed_dial_delete">Ștergeți</string>
+  <string name="speed_dial_unassigned_dialog_title">Cheie neatribuită</string>
+  <string name="speed_dial_unassigned_dialog_message">Niciun contact cu apelare rapidă nu este atribuit tastei \'<xliff:g id="number">%s</xliff:g>\'. Vreți să atribuiţi un contact acum?</string>
+  <string name="dialog_speed_dial_airplane_mode_message">"Pentru a utiliza apelarea rapidă, în primul rând opriţi modul avion."</string>
+  <string name="msim_ime_dialog_title">Identificatorul dispozitivului</string>
+  <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
+  <string name="call_log_show_all_slots">Toate SIM-urile</string>
+  <string name="yes">Da</string>
+  <string name="no">Nu</string>
+  <string name="call_duration_active">Durata activă:</string>
+  <string name="call_duration_call_out">Durată apel:</string>
+  <string name="call_log_all_calls_header">Toate apelurile</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 15891db20..acf4de862 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Сорт. по количеству</string>
   <string name="menu_add_to_blacklist">Добавить в чёрный список</string>
   <string name="toast_added_to_blacklist">Абонент «<xliff:g id="number">%s</xliff:g>» добавлен в чёрный список</string>
+  <string name="menu_delete_from_blacklist">Удалить из чёрного списка</string>
+  <string name="toast_deleted_from_blacklist">Абонент «<xliff:g id="number">%s</xliff:g>» удалён из чёрного списка</string>
   <string name="nearby_places">Места рядом</string>
   <string name="people">Люди</string>
   <string name="start_call_playback">Воспроизвести запись</string>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index 376b52f20..a84b9c20f 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">ඇමතුම් ගණන අනුව සුබෙදන්න</string>
   <string name="menu_add_to_blacklist">අපලේඛණයට එක් කරන්න</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> අපලේඛණයට එක් කෙරුණි</string>
+  <string name="menu_delete_from_blacklist">අපලේඛණයෙන් මකා දමන්න</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> අපලේඛණයෙන් මකා දැමිණි</string>
   <string name="nearby_places">අවට ස්ථාන</string>
   <string name="people">ප්‍රජාව</string>
   <string name="start_call_playback">රෙකෝඩිතය ධාවනය කරන්න</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 9353b59b2..de5f27fdc 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Zoradiť podľa počtu hovorov</string>
   <string name="menu_add_to_blacklist">Pridať na čiernu listinu</string>
   <string name="toast_added_to_blacklist">Číslo <xliff:g id="number">%s</xliff:g> bolo pridané na čiernu listinu</string>
+  <string name="menu_delete_from_blacklist">Odstrániť z čiernej listiny</string>
+  <string name="toast_deleted_from_blacklist">Číslo <xliff:g id="number">%s</xliff:g> bolo odstránené z čiernej listiny</string>
   <string name="nearby_places">Miesta v blízkosti</string>
   <string name="people">Ľudia</string>
   <string name="start_call_playback">Prehrať nahrávku</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index e6a086c09..54f3997a8 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Сортирај по броју позива</string>
   <string name="menu_add_to_blacklist">Додај на црну листу</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> додат на црну листу</string>
+  <string name="menu_delete_from_blacklist">Брисање из црне листе</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> обрисано из црне листе</string>
   <string name="nearby_places">Оближња места</string>
   <string name="people">Особе</string>
   <string name="start_call_playback">Пусти снимак</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 45e0c0e02..b678a53f0 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -50,5 +50,16 @@
   <string name="start_call_playback">Spela inspelning</string>
   <string name="stop_call_playback">Stoppa</string>
   <string name="call_playback_error_message">Det gick inte att spela inspelningen</string>
+  <string name="video_call">Videosamtal</string>
+  <string name="video_call_settings">Videosamtalsinställningar</string>
+  <string name="description_videocall">Videosamtal <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="speed_dial_not_set">(ej angivet)</string>
+  <string name="speed_dial_replace">Ersätt</string>
+  <string name="speed_dial_delete">Ta bort</string>
+  <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
+  <string name="call_log_show_all_slots">Alla SIM</string>
+  <string name="yes">Ja</string>
   <string name="no">Nej</string>
+  <string name="call_duration_call_out">Samtalslängd:</string>
+  <string name="call_log_all_calls_header">Alla samtal</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index d96c703c1..181e09436 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">เรียงตามจำนวนครั้งการโทร</string>
   <string name="menu_add_to_blacklist">เพิ่มไปยังบัญชีดำ</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number"> %s</xliff:g> เพิ่มไปยังบัญชีดำ</string>
+  <string name="menu_delete_from_blacklist">ลบออกจากบัญชีดำ</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number"> %s</xliff:g> ถูกลบออกจากบัญชีดำ</string>
   <string name="nearby_places">สถานใกล้เคียง</string>
   <string name="people">ผู้คน</string>
   <string name="start_call_playback">เล่นบันทึก</string>
diff --git a/res/values-tr/cm_plurals.xml b/res/values-tr/cm_plurals.xml
index 1d16c688d..e93a90b80 100644
--- a/res/values-tr/cm_plurals.xml
+++ b/res/values-tr/cm_plurals.xml
@@ -17,15 +17,19 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="hour">
+    <item quantity="one">%d sa</item>
     <item quantity="other">%d sa</item>
   </plurals>
   <plurals name="minute">
-    <item quantity="other">%d dk</item>
+    <item quantity="one">%d dk</item>
+    <item quantity="other">%d dak</item>
   </plurals>
   <plurals name="second">
+    <item quantity="one">%d sn</item>
     <item quantity="other">%d sn</item>
   </plurals>
   <plurals name="call">
+    <item quantity="one">%d çağrı</item>
     <item quantity="other">%d çağrı</item>
   </plurals>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 9a6aa71e6..b3d1e6496 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Arama sayısına göre sırala</string>
   <string name="menu_add_to_blacklist">Karalisteye ekle</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> kara listeye eklendi</string>
+  <string name="menu_delete_from_blacklist">Kara listeden sil</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> kara listeden silindi</string>
   <string name="nearby_places">Yakın yerler</string>
   <string name="people">Kişiler</string>
   <string name="start_call_playback">Kaydı oynat</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 84fdd61b9..abfbf77d2 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">Сортувати за кількістю викликів</string>
   <string name="menu_add_to_blacklist">Додати в чорний список</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> додано до чорного списку</string>
+  <string name="menu_delete_from_blacklist">Видалити з чорного списоку</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> видалено з чорного списоку</string>
   <string name="nearby_places">Місця поруч</string>
   <string name="people">Люди</string>
   <string name="start_call_playback">Відтворення запису</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 6d2b7a035..9cd900bd1 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -45,6 +45,8 @@
   <string name="call_stats_sort_by_count">以通话次数排序</string>
   <string name="menu_add_to_blacklist">添加到黑名单</string>
   <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> 已添加到黑名单中</string>
+  <string name="menu_delete_from_blacklist">从黑名单中删除</string>
+  <string name="toast_deleted_from_blacklist">已从黑名单中删除 <xliff:g id="number">%s</xliff:g></string>
   <string name="nearby_places">附近地点</string>
   <string name="people">人</string>
   <string name="start_call_playback">播放录音</string>
diff --git a/src/com/android/dialer/lookup/dastelefonbuch/TelefonbuchApi.java b/src/com/android/dialer/lookup/dastelefonbuch/TelefonbuchApi.java
index 2d9ed3e5f..4e619edc1 100644
--- a/src/com/android/dialer/lookup/dastelefonbuch/TelefonbuchApi.java
+++ b/src/com/android/dialer/lookup/dastelefonbuch/TelefonbuchApi.java
@@ -72,6 +72,9 @@ public class TelefonbuchApi {
             boolean dotall, boolean removeSpans) {
         String result = LookupUtils.firstRegexResult(output, regex, dotall);
         if (result != null && removeSpans) {
+            // completely remove hidden spans (including contents) ...
+            result = result.replaceAll("<span class=\"hide\".*?\\/span>", "");
+            // ... and remove span wrappers around data content
             result = result.replaceAll("</?span.*?>", "");
         }
         return LookupUtils.fromHtml(result);