Merge remote-tracking branch 'remotes/github/cm-12.1' into HEAD

Issue-Id: RM-170

Change-Id: Iad8c71284db5ef05fc4bd5d85bb6389611f5239c

15 files changed, 208 insertions, 17 deletions

diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 956bc7a4d..09cca4f81 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -33,6 +33,7 @@
   <string name="preference_category_t9_dialpad_search">Guetar Dialpad T9</string>
   <string name="t9_search_input_locale">Entrada gueta T9</string>
   <string name="t9_search_input_locale_default">Predetermináu</string>
+  <string name="type_blacklist">Llamada bloquiada</string>
   <string name="call_log_stats_title">Estadístiques</string>
   <string name="callStatsDetailTitle">Detalles de llamada</string>
   <string name="call_stats">Estadístiques de llamaes</string>
@@ -46,6 +47,8 @@
   <string name="call_stats_outgoing">Salientes: <xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_missed">Perdíes</string>
   <string name="call_stats_missed_percent">Perdíes: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_blacklist">Bloquiada</string>
+  <string name="call_stats_blacklist_percent">Bloquiaes: <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">Data aniciu</string>
@@ -63,6 +66,8 @@
   <string name="call_stats_reset_filter">Restablecer rangu de dates</string>
   <string name="call_stats_sort_by_duration">Ordenar por duración</string>
   <string name="call_stats_sort_by_count">Ordenar por númb. llamaes</string>
+  <string name="menu_add_to_blacklist">Amestar a la llista de contautos bloquiaos</string>
+  <string name="toast_added_to_blacklist">%s amestaos a la llista de contautos bloquiaos.</string>
   <string name="speed_dial_settings">Axustes de marcáu rápidu</string>
   <string name="speed_dial_not_set">(ensin afitar)</string>
   <string name="speed_dial_replace">Trocar</string>
@@ -87,7 +92,13 @@
   <string name="call_log_all_calls_header">Toles llamaes</string>
   <string name="calllog_search_hint">Guetar rexistru de llamaes</string>
   <string name="msim_ime_dialog_title">Identificador del preséu</string>
+  <string name="call_log_blacklist_header">Namái llamaes bloquiaes</string>
   <string name="start_call_playback">Reproducir grabación</string>
   <string name="stop_call_playback">Detener</string>
   <string name="call_playback_error_message">Nun pudo reproducise la grabación</string>
+  <string name="sensors_category_title">Opciones de sensores</string>
+  <string name="smart_mute_title">Silenciu intelixente</string>
+  <string name="smart_mute_summary">Silencia la llamada entrante voltiando\'l preséu</string>
+  <string name="smart_dialer_title">Llamada intelixente</string>
+  <string name="smart_dialer_summary">Llama automáticamente al númberu marcáu moviendo\'l to preséu a la to oreya</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index e21e22b28..e936b0655 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -105,8 +105,6 @@
   <string name="simContacts_emptyLoading">Cargando dende tarxeta SIM…</string>
   <string name="simContacts_title">Contautos de tarxeta SIM</string>
   <string name="call_not_available">Nun pue facese una llamada porque l\'app Teléfonu ta deshabilitada.</string>
-  <string name="call_log_activity_title_font_family">sans-serif-light</string>
-  <string name="view_full_call_history_font_family">sans-serif</string>
   <string name="show_favorites_only">Amosar namái favoritos</string>
   <string name="call_log_activity_title">Historial</string>
   <string name="call_log_all_title">Too</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index b5b8b8fb6..5586957c2 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -16,10 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="nearby_places">Yaxındakı yerlər</string>
+  <string name="nearby_places">Yaxındakı məkanlar</string>
   <string name="people">İnsanlar</string>
+  <string name="lookup_settings_label">Telefon nömrəsi axtar</string>
+  <string name="lookup_settings_description">Bilinməyən telefon nömrələrini axtar</string>
+  <string name="enable_forward_lookup_title">Birbaşa axtarış</string>
+  <string name="enable_forward_lookup_summary">Nömrə yığımında axtarış edərkən yaxın yerləri göstər</string>
+  <string name="enable_people_lookup_title">Şəxs axtarışı</string>
+  <string name="enable_people_lookup_summary">Nömrə yığımında axtarış edərkən şəxslər üçün xətdə nəticələrini göstər</string>
+  <string name="enable_reverse_lookup_title">Geri axtarış</string>
+  <string name="enable_reverse_lookup_summary">Gələn zənglərdə bilinməyən nömrələr üçün şəxs və ya yer haqqında məlumat axtar</string>
+  <string name="forward_lookup_provider_title">Axtarış yönləndirmə təchizatçısı</string>
+  <string name="people_lookup_provider_title">Şəxs axtarış təchizatçısı</string>
+  <string name="reverse_lookup_provider_title">Geri axtarış təchizatçısı</string>
+  <string name="cyngn_reverse_lookup_provider_name">Cyngn Çincə (CN)</string>
+  <string name="preference_category_t9_dialpad_search">Nömrə yığımı T9 axtarışı</string>
+  <string name="t9_search_input_locale">T9 axtarış daxiletmə</string>
+  <string name="t9_search_input_locale_default">İlkin</string>
+  <string name="type_blacklist">Əngəllənən zəng</string>
   <string name="call_log_stats_title">Statistika</string>
   <string name="callStatsDetailTitle">Zəng statistikası təfsilatı</string>
+  <string name="call_stats">Zəng statistikaları</string>
+  <string name="call_stats_refresh">Yenilə</string>
+  <string name="activity_title_call_stats">Zəng statistikaları</string>
   <string name="call_stats_nav_all">Hamısı</string>
   <string name="call_stats_nav_incoming">Gələn</string>
   <string name="call_stats_nav_outgoing">Gedən</string>
@@ -28,21 +47,58 @@
   <string name="call_stats_outgoing">Gedən: <xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_missed">Cavabsız</string>
   <string name="call_stats_missed_percent">Cavabsız: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_blacklist">Əngəlləndi</string>
+  <string name="call_stats_blacklist_percent">Əngəlləndi: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_header_total">Ümumi: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string>
+  <string name="call_stats_header_total_callsonly">Ümumi: <xliff:g id="call_count">%s</xliff:g></string>
   <string name="call_stats_filter_from">Başlanğıc tarixi</string>
   <string name="call_stats_filter_to">Bitmə tarixi</string>
+  <string name="call_stats_filter_picker_title">Filtr aralığı</string>
+  <string name="date_quick_selection">Cəld seçim</string>
   <string name="date_qs_currentmonth">Hazırki ay</string>
+  <string name="date_qs_currentquarter">Hazırki rüb</string>
   <string name="date_qs_currentyear">Hazırki il</string>
   <string name="date_qs_lastweek">Keçən həftə</string>
   <string name="date_qs_lastmonth">Keçən ay</string>
+  <string name="date_qs_lastquarter">Son rüb</string>
   <string name="date_qs_lastyear">Keçən il</string>
+  <string name="call_stats_date_filter">Vaxt aralığını nizamla</string>
+  <string name="call_stats_reset_filter">Vaxt aralığını sıfırla</string>
   <string name="call_stats_sort_by_duration">Zəng müddətinə görə sırala</string>
   <string name="call_stats_sort_by_count">Zəng sayına görə sırala</string>
+  <string name="menu_add_to_blacklist">Əngəllənən zəng edənlər siyahısına əlavə et</string>
+  <string name="toast_added_to_blacklist">%s əngəllənən zəng edənlər siyahısına əlavə edildi.</string>
+  <string name="speed_dial_settings">Cəld yığım tənzimləmələri</string>
   <string name="speed_dial_not_set">(tənzimlənməyib)</string>
   <string name="speed_dial_replace">Dəyişdir</string>
   <string name="speed_dial_delete">Sil</string>
+  <string name="speed_dial_unassigned_dialog_title">Nömrə təyin edilmədi</string>
+  <string name="speed_dial_unassigned_dialog_message">\'<xliff:g id="number">%s</xliff:g>\' nömrəsinə cəld nömrə yığımı təyin edilmədi. İndi təyin etmək istərdiniz?</string>
+  <string name="dialog_speed_dial_airplane_mode_message">Cəld nömrə yığımından istifadə etmək üçün uçuş rejimini bağlayın.</string>
   <string name="yes">Bəli</string>
   <string name="no">Xeyr</string>
+  <string name="incall_vibration_category_title">Gələn zəng titrəməsi</string>
+  <string name="incall_vibrate_outgoing_title">Cavab verәrkәn titrət</string>
+  <string name="vibrate_call_waiting">Zəng gözlədiləndə titrət</string>
+  <string name="incall_vibrate_hangup_title">Söndürüləndə titrət</string>
+  <string name="incall_vibrate_45_title">Hər dəqiqə titrət</string>
+  <string name="incall_vibrate_45_summary">Gedən zənglərin hər dəqiqəsinin 45-ci saniyəsində titrəyər</string>
+  <string name="detailed_incall_info_title">Zəng edənin təfsilatlı məlumatı</string>
+  <string name="detailed_incall_info_summary">Gələn zəng ekranında zəng edən haqqında əlavə məlumat göstər</string>
   <string name="video_call">Görüntülü zəng</string>
+  <string name="call_duration_active">Aktiv müddət:</string>
+  <string name="call_duration_call_out">Zəng müddəti:</string>
   <string name="call_log_show_all_slots">Bütün SIMlər</string>
+  <string name="call_log_all_calls_header">Bütün zənglər</string>
   <string name="calllog_search_hint">Zəng qeydini axtar</string>
+  <string name="msim_ime_dialog_title">Cihaz təyinedicisi</string>
+  <string name="call_log_blacklist_header">Yalnız əngəllənən zənglər</string>
+  <string name="start_call_playback">Səsyazmanı oynat</string>
+  <string name="stop_call_playback">Dayandır</string>
+  <string name="call_playback_error_message">Səsyazma oynadıla bilmədi</string>
+  <string name="sensors_category_title">Sensor seçimləri</string>
+  <string name="smart_mute_title">Ağıllı səs kəsmə</string>
+  <string name="smart_mute_summary">Cihazı çevirəndə gələn zəngi səssizə alar</string>
+  <string name="smart_dialer_title">Ağıllı zəng</string>
+  <string name="smart_dialer_summary">Cihazınızı qulağınıza apardıqda yığılan nömrəyə avtomatik zəng edilər</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 09993b8df..56b8e8119 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -97,8 +97,8 @@
   <string name="stop_call_playback">Ferma</string>
   <string name="call_playback_error_message">Impossibile riprodurre la registrazione</string>
   <string name="sensors_category_title">Opzioni sensore</string>
-  <string name="smart_mute_title">Smart mute</string>
+  <string name="smart_mute_title">Muto intelligente</string>
   <string name="smart_mute_summary">Silenzia la chiamata in arrivo capovolgendo il dispositivo</string>
-  <string name="smart_dialer_title">Smart Call</string>
+  <string name="smart_dialer_title">Chiamata intelligente</string>
   <string name="smart_dialer_summary">Chiama automaticamente il numero composto avvicinando il dispositivo all\'orecchio</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 404f2c480..098268307 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -101,7 +101,6 @@
   <string name="meid">MEID</string>
   <string name="simContacts_emptyLoading">نیشاندان له‌ سیمکارده‌وه‌\u2026</string>
   <string name="simContacts_title">په‌یوه‌ندی سیمکارد</string>
-  <string name="call_log_activity_title_font_family">sans-serif-light</string>
   <string name="show_favorites_only">نیشاندانی ته‌نیا دڵخوازه‌کان</string>
   <string name="call_log_activity_title">مێژوو</string>
   <string name="call_log_all_title">هه‌موو</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index f3f703f49..026a42c06 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -92,7 +92,7 @@
   <string name="call_log_all_calls_header">Todas as chamadas</string>
   <string name="calllog_search_hint">Pesquisar registo de chamadas</string>
   <string name="msim_ime_dialog_title">Identificador de dispositivo</string>
-  <string name="call_log_blacklist_header">Só chamadas bloqueadas</string>
+  <string name="call_log_blacklist_header">Apenas chamadas bloqueadas</string>
   <string name="start_call_playback">Reproduzir a gravação</string>
   <string name="stop_call_playback">Parar</string>
   <string name="call_playback_error_message">Falha ao reproduzir a gravação</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 880ab60f7..3532919e2 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -32,7 +32,7 @@
   <string name="cyngn_reverse_lookup_provider_name">Cyngn Chinese (CN)</string>
   <string name="preference_category_t9_dialpad_search">Iskanje tipkovnice za klicanje T9</string>
   <string name="t9_search_input_locale">Vnos iskanja T9</string>
-  <string name="t9_search_input_locale_default">Privzeto</string>
+  <string name="t9_search_input_locale_default">Privzeti</string>
   <string name="type_blacklist">Blokiran klic</string>
   <string name="call_log_stats_title">Statistika</string>
   <string name="callStatsDetailTitle">Podrobnosti statistike klicev</string>
diff --git a/res/values-sr/cm_plurals.xml b/res/values-sr/cm_plurals.xml
index b9442a8cb..ce49dc5de 100644
--- a/res/values-sr/cm_plurals.xml
+++ b/res/values-sr/cm_plurals.xml
@@ -19,25 +19,21 @@
   <plurals name="hour">
     <item quantity="one">1 сат</item>
     <item quantity="few">%d сата</item>
-    <item quantity="many">%d сата</item>
     <item quantity="other">%d сата</item>
   </plurals>
   <plurals name="minute">
     <item quantity="one">1 мин</item>
     <item quantity="few">%d минута</item>
-    <item quantity="many">%d минута</item>
     <item quantity="other">%d минута</item>
   </plurals>
   <plurals name="second">
     <item quantity="one">1 сек</item>
     <item quantity="few">%d секунде</item>
-    <item quantity="many">%d секунде</item>
     <item quantity="other">%d секунде</item>
   </plurals>
   <plurals name="call">
     <item quantity="one">1 позив</item>
     <item quantity="few">%d позива</item>
-    <item quantity="many">%d позива</item>
     <item quantity="other">%d позива</item>
   </plurals>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 8ae42f26c..90d939aff 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -100,4 +100,5 @@
   <string name="smart_mute_title">ปิดเสียงอัจฉริยะ</string>
   <string name="smart_mute_summary">ปิดเสียงเรียกเข้าโดยการพลิกอุปกรณ์</string>
   <string name="smart_dialer_title">การโทรอัจฉริยะ</string>
+  <string name="smart_dialer_summary">โทรหาหมายเลขที่มีการโทรออกโดยอัตโนมัติโดยเคลื่อนอุปกรณ์ไปที่หูของคุณ</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 4dfb3b58b..77491b915 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -87,7 +87,6 @@
   <string name="contact_list_loading">يۈكلەۋاتىدۇ…</string>
   <string name="simContacts_emptyLoading">SIM كارتىدىن يۈكلەۋاتىدۇ…</string>
   <string name="simContacts_title">SIM كارتىدىكى ئالاقەداشلار</string>
-  <string name="call_log_activity_title_font_family">sans-serif-light</string>
   <string name="show_favorites_only">دائىملىق ئالاقەداشلارنىلا كۆرسەت</string>
   <string name="call_log_activity_title">تارىخ</string>
   <string name="call_log_all_title">ھەممىسى</string>
diff --git a/res/values-vi/cm_plurals.xml b/res/values-vi/cm_plurals.xml
new file mode 100644
index 000000000..27e3e2fa5
--- /dev/null
+++ b/res/values-vi/cm_plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="hour">
+    <item quantity="other">%d giờ</item>
+  </plurals>
+  <plurals name="minute">
+    <item quantity="other">%d phút</item>
+  </plurals>
+  <plurals name="second">
+    <item quantity="other">%d giây</item>
+  </plurals>
+  <plurals name="call">
+    <item quantity="other">%d cuộc gọi</item>
+  </plurals>
+</resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 5ceb31ce7..a244f6c0f 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -17,4 +17,88 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="nearby_places">Địa điểm gần kề</string>
+  <string name="people">Mọi người</string>
+  <string name="lookup_settings_label">Tra cứu số điện thoại</string>
+  <string name="lookup_settings_description">Tra cứu số điện thoại không biết</string>
+  <string name="enable_forward_lookup_title">Tra cứu xuôi</string>
+  <string name="enable_forward_lookup_summary">Hiển thị các địa điểm gần kề khi tìm kiếm trong trình quay số</string>
+  <string name="enable_people_lookup_title">Tra cứu mọi người</string>
+  <string name="enable_people_lookup_summary">Hiển thị kết quả trực tuyến về người khi tìm kiếm trong trình quay số</string>
+  <string name="enable_reverse_lookup_title">Tra cứu ngược</string>
+  <string name="enable_reverse_lookup_summary">Tra cứu thông tin về người hoặc vị trí cho những số gọi đến không biết</string>
+  <string name="forward_lookup_provider_title">Nhà cung cấp tra cứu xuôi</string>
+  <string name="people_lookup_provider_title">Nhà cung cấp tra cứu người</string>
+  <string name="reverse_lookup_provider_title">Nhà cung cấp tra cứu ngược</string>
+  <string name="cyngn_reverse_lookup_provider_name">Cyngn Trung Quốc (CN)</string>
+  <string name="preference_category_t9_dialpad_search">Bàn phím tìm kiếm T9</string>
+  <string name="t9_search_input_locale">Ô tìm kiếm T9</string>
+  <string name="t9_search_input_locale_default">Mặc định</string>
+  <string name="type_blacklist">Cuộc gọi bị chặn</string>
+  <string name="call_log_stats_title">Thống kê</string>
+  <string name="callStatsDetailTitle">Chi tiết thống kê cuộc gọi</string>
+  <string name="call_stats">Thống kê cuộc gọi</string>
+  <string name="call_stats_refresh">Làm mới</string>
+  <string name="activity_title_call_stats">Thống kê cuộc gọi</string>
+  <string name="call_stats_nav_all">Tất cả</string>
+  <string name="call_stats_nav_incoming">Gọi đến</string>
+  <string name="call_stats_nav_outgoing">Gọi đi</string>
+  <string name="call_stats_nav_missed">Gọi nhỡ</string>
+  <string name="call_stats_incoming">Đến: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_outgoing">Đi: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_missed">Gọi nhỡ</string>
+  <string name="call_stats_missed_percent">Nhỡ: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_blacklist">Bị chặn</string>
+  <string name="call_stats_blacklist_percent">Bị chặn: <xliff:g id="percent">%d </xliff:g>%%</string>
+  <string name="call_stats_header_total">Tổng số: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string>
+  <string name="call_stats_header_total_callsonly">Tổng số: <xliff:g id="call_count">%s</xliff:g></string>
+  <string name="call_stats_filter_from">Ngày bắt đầu</string>
+  <string name="call_stats_filter_to">Ngày kết thúc</string>
+  <string name="call_stats_filter_picker_title">Phạm vi lọc</string>
+  <string name="date_quick_selection">Chọn nhanh</string>
+  <string name="date_qs_currentmonth">Tháng hiện tại</string>
+  <string name="date_qs_currentquarter">Quý hiện tại</string>
+  <string name="date_qs_currentyear">Năm hiện tại</string>
+  <string name="date_qs_lastweek">Tuần trước</string>
+  <string name="date_qs_lastmonth">Tháng trước</string>
+  <string name="date_qs_lastquarter">Quý trước</string>
+  <string name="date_qs_lastyear">Năm trước</string>
+  <string name="call_stats_date_filter">Điều chỉnh khoảng thời gian</string>
+  <string name="call_stats_reset_filter">Đặt lại khoảng thời gian</string>
+  <string name="call_stats_sort_by_duration">Sắp xếp theo thời lượng cuộc gọi</string>
+  <string name="call_stats_sort_by_count">Sắp xếp theo số lượng cuộc gọi</string>
+  <string name="menu_add_to_blacklist">Thêm vào danh sách chặn người gọi</string>
+  <string name="toast_added_to_blacklist">%s được thêm vào danh sách chặn người gọi.</string>
+  <string name="speed_dial_settings">Thiết đặt quay số nhanh</string>
+  <string name="speed_dial_not_set">(không thiết lập)</string>
+  <string name="speed_dial_replace">Thay thế</string>
+  <string name="speed_dial_delete">Xóa</string>
+  <string name="speed_dial_unassigned_dialog_title">Phím chưa ấn định</string>
+  <string name="speed_dial_unassigned_dialog_message">Không có thao tác quay số nhanh nào được ấn định cho phím số \'<xliff:g id="number">%s</xliff:g>\'. Bạn có muốn ấn định một thao tác bây giờ không?</string>
+  <string name="dialog_speed_dial_airplane_mode_message">Để sử dụng quay số nhanh, trước tiên hãy tắt chế độ máy bay.</string>
+  <string name="yes">Có</string>
+  <string name="no">Không</string>
+  <string name="incall_vibration_category_title">Rung trong khi gọi</string>
+  <string name="incall_vibrate_outgoing_title">Rung khi trả lời</string>
+  <string name="vibrate_call_waiting">Rung khi chờ cuộc gọi</string>
+  <string name="incall_vibrate_hangup_title">Rung khi gác máy</string>
+  <string name="incall_vibrate_45_title">Rung mỗi phút</string>
+  <string name="incall_vibrate_45_summary">Rung tại giây 45 mỗi phút trong khi gọi đi</string>
+  <string name="detailed_incall_info_title">Thông tin chi tiết người gọi</string>
+  <string name="detailed_incall_info_summary">Hiển thị thêm thông tin về người gọi trong màn hình cuộc gọi đến</string>
+  <string name="video_call">Cuộc gọi video</string>
+  <string name="call_duration_active">Thời gian hoạt động:</string>
+  <string name="call_duration_call_out">Thời gian gọi:</string>
+  <string name="call_log_show_all_slots">Tất cả các SIM</string>
+  <string name="call_log_all_calls_header">Tất cả các cuộc gọi</string>
+  <string name="calllog_search_hint">Tìm trong nhật ký cuộc gọi</string>
+  <string name="msim_ime_dialog_title">Ký hiệu nhận dạng thiết bị</string>
+  <string name="call_log_blacklist_header">Chỉ các cuộc gọi bị chặn</string>
+  <string name="start_call_playback">Phát ghi âm</string>
+  <string name="stop_call_playback">Dừng</string>
+  <string name="call_playback_error_message">Không thể phát ghi âm</string>
+  <string name="sensors_category_title">Tùy chọn cảm biến</string>
+  <string name="smart_mute_title">Tắt tiếng thông minh</string>
+  <string name="smart_mute_summary">Tắt tiếng cuộc gọi đến bằng cách lật úp thiết bị</string>
+  <string name="smart_dialer_title">Cuộc gọi thông minh</string>
+  <string name="smart_dialer_summary">Tự động gọi đến số đã quay bằng cách đưa thiết bị lên tai của bạn</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index a066b5b3c..d49f53a54 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -33,6 +33,7 @@
   <string name="preference_category_t9_dialpad_search">T9 撥號鍵盤</string>
   <string name="t9_search_input_locale">T9 搜尋輸入</string>
   <string name="t9_search_input_locale_default">預設</string>
+  <string name="type_blacklist">已封鎖的通話</string>
   <string name="call_log_stats_title">統計資料</string>
   <string name="callStatsDetailTitle">通話統計詳細資料</string>
   <string name="call_stats">通話統計</string>
@@ -46,6 +47,8 @@
   <string name="call_stats_outgoing">撥出：<xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_missed">未接來電</string>
   <string name="call_stats_missed_percent">未接：<xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_blacklist">已封鎖</string>
+  <string name="call_stats_blacklist_percent">已封鎖： <xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_header_total">總計：<xliff:g id="call_count">%s</xliff:g>，<xliff:g id="duration">%s</xliff:g></string>
   <string name="call_stats_header_total_callsonly">總計：<xliff:g id="call_count">%s</xliff:g></string>
   <string name="call_stats_filter_from">開始日期</string>
@@ -63,6 +66,8 @@
   <string name="call_stats_reset_filter">重設時間範圍</string>
   <string name="call_stats_sort_by_duration">按通話時間排列</string>
   <string name="call_stats_sort_by_count">按通話次數排列</string>
+  <string name="menu_add_to_blacklist">添加至已封鎖來電者名單</string>
+  <string name="toast_added_to_blacklist">%s 已添加至已封鎖來電者名單。</string>
   <string name="speed_dial_settings">快速撥號設定</string>
   <string name="speed_dial_not_set">(未設定)</string>
   <string name="speed_dial_replace">取代</string>
@@ -74,6 +79,7 @@
   <string name="no">否</string>
   <string name="incall_vibration_category_title">來電震動</string>
   <string name="incall_vibrate_outgoing_title">接通時震動</string>
+  <string name="vibrate_call_waiting">來電等待時震動</string>
   <string name="incall_vibrate_hangup_title">掛斷時震動</string>
   <string name="incall_vibrate_45_title">每分鐘震動一次</string>
   <string name="incall_vibrate_45_summary">撥出電話後每分鐘的 45 秒時震動</string>
@@ -86,7 +92,13 @@
   <string name="call_log_all_calls_header">所有通話</string>
   <string name="calllog_search_hint">搜尋通話紀錄</string>
   <string name="msim_ime_dialog_title">裝置識別碼</string>
+  <string name="call_log_blacklist_header">只有已封鎖通話</string>
   <string name="start_call_playback">播放錄音</string>
   <string name="stop_call_playback">停止</string>
   <string name="call_playback_error_message">無法播放錄音</string>
+  <string name="sensors_category_title">感應器選項</string>
+  <string name="smart_mute_title">智能靜音</string>
+  <string name="smart_mute_summary">翻轉設備以靜音來電</string>
+  <string name="smart_dialer_title">智能撥號</string>
+  <string name="smart_dialer_summary">通過將設備移動到耳朵自動撥出號碼</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d10ec2629..d2614e9ff 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,6 +21,7 @@
     <color name="dialtacts_secondary_text_color">#737373</color>
     <color name="dialer_red_highlight_color">#ff1744</color>
     <color name="dialer_green_highlight_color">#00c853</color>
+    <color name="dialer_blue_highlight_color">#00a8ff</color>
 
     <color name="setting_background_color">#ffffff</color>
     <color name="setting_button_color">#eee</color>
@@ -91,8 +92,11 @@
     <!-- Color for blacklist call icons. -->
     <color name="blacklisted_call">#ff000000</color>
 
-    <!-- Color for answered or outgoing call icons. -->
-    <color name="answered_call">@color/dialer_green_highlight_color</color>
+    <!-- Color for answered call icons. -->
+    <color name="answered_incoming_call">@color/dialer_blue_highlight_color</color>
+
+    <!-- Color for outgoing call icons. -->
+    <color name="answered_outgoing_call">@color/dialer_green_highlight_color</color>
 
     <!-- Color for icons in the actionbar -->
     <color name="actionbar_icon_color">#ffffff</color>
diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java
index eb7247416..e4713ff80 100755
--- a/src/com/android/dialer/calllog/CallTypeIconsView.java
+++ b/src/com/android/dialer/calllog/CallTypeIconsView.java
@@ -200,11 +200,11 @@ public class CallTypeIconsView extends View {
             final android.content.res.Resources r = context.getResources();
 
             incoming = r.getDrawable(R.drawable.ic_call_arrow);
-            incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
+            incoming.setColorFilter(r.getColor(R.color.answered_incoming_call), PorterDuff.Mode.MULTIPLY);
 
             // Create a rotated instance of the call arrow for outgoing calls.
             outgoing = BitmapUtil.getRotatedDrawable(r, R.drawable.ic_call_arrow, 180f);
-            outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
+            outgoing.setColorFilter(r.getColor(R.color.answered_outgoing_call), PorterDuff.Mode.MULTIPLY);
 
             // Need to make a copy of the arrow drawable, otherwise the same instance colored
             // above will be recolored here.