diff --git a/res/drawable-finger/ic_menu_allfriends.png b/res/drawable-finger/ic_menu_allfriends.png
deleted file mode 100755
index a5bd331..0000000
--- a/res/drawable-finger/ic_menu_allfriends.png
+++ /dev/null
Binary files differ
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 17aaa16..99c99e4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Kontakty"</string>
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Označené hvězdičkou"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Použít dotykovou tónovou klávesnici"</string>
     <string name="dialer_returnToInCallScreen">"Návrat k probíhajícímu hovoru"</string>
     <string name="dialer_addAnotherCall">"Přidat hovor"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e826bf6..cf419a2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Kontakte"</string>
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Markiert"</string>
@@ -57,7 +59,7 @@
     <string name="postalLabelsGroup">"Postanschrift"</string>
     <string name="otherLabelsGroup">"Sonstiges"</string>
   <string-array name="otherLabels">
-    <item>"Organisation"</item>
+    <item>"Firma/Organisation"</item>
     <item>"Notiz"</item>
   </string-array>
     <string name="errorDialogTitle">"Keine Bilder"</string>
@@ -133,4 +135,24 @@
     <skip />
     <!-- no translation found for dialer_addAnotherCall (4205688819890074468) -->
     <skip />
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 07b51da..b26e9ae 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -62,7 +62,6 @@
     <string name="menu_displayGroup">"Display group"</string>
     <string name="syncGroupPreference">"Sync groups"</string>
     <string name="importFromSim">"Import from SIM card"</string>
-    <string name="alphabet">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="send_to_voicemail_checkbox">"Send calls directly to voicemail."</string>
     <string name="send_to_voicemail_view">"Calls are sent directly to voicemail."</string>
     <string name="default_ringtone">"Default"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 03ba12e..6125ac1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Contactos"</string>
     <string name="shortcutContact">"Contacto"</string>
     <string name="starredList">"Destacados"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Usar el teclado de tonos"</string>
     <string name="dialer_returnToInCallScreen">"Volver a la llamada en curso"</string>
     <string name="dialer_addAnotherCall">"Añadir llamada"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index aeed55f..b8b088b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Contacts"</string>
     <string name="shortcutContact">"Contact"</string>
     <string name="starredList">"Marqués d\'une étoile"</string>
@@ -16,7 +18,7 @@
     <string name="menu_callNumber">"Appeler <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_addStar">"Ajouter aux favoris"</string>
     <string name="menu_removeStar">"Supprimer des favoris"</string>
-    <string name="menu_showBarcode">"Afficher le code à barres"</string>
+    <string name="menu_showBarcode">"Afficher le code-barres"</string>
     <string name="menu_editContact">"Modifier le contact"</string>
     <string name="menu_deleteContact">"Supprimer le contact"</string>
     <string name="menu_call">"Appel"</string>
@@ -62,7 +64,7 @@
     <string name="errorDialogTitle">"Aucune image"</string>
     <string name="photoPickerNotFoundText">"Aucune image disponible sur le téléphone."</string>
     <string name="attachToContact">"Icône de contact"</string>
-    <string name="customLabelPickerTitle">"Nom de libellé personnalisé"</string>
+    <string name="customLabelPickerTitle">"Libellé personnalisé"</string>
     <string name="menu_displayGroup">"Afficher les groupes"</string>
     <string name="syncGroupPreference">"Modifier les groupes à synchroniser"</string>
     <string name="importFromSim">"Importer des contacts"</string>
@@ -108,7 +110,7 @@
     <string name="unknown">"Inconnu"</string>
     <string name="private_num">"Numéro privée"</string>
     <string name="dialerKeyboardHintText">"Utilisez le clavier pour effectuer la numérotation"</string>
-    <string name="dialerDialpadHintText">"Numéroter pour ajouter un appel"</string>
+    <string name="dialerDialpadHintText">"Composer le numéro pour ajouter un appel"</string>
     <string name="simContacts_emptyLoading">"Chargement depuis la carte SIM..."</string>
     <string name="simContacts_title">"Contacts de carte SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronisez vos contacts Google !"</font>" "\n"Une fois que vous aurez synchronisé votre téléphone, vos contacts seront disponibles, où que vous soyez."</string>
@@ -117,7 +119,27 @@
     <string name="liveFolder_all_label">"Tous les contacts"</string>
     <string name="liveFolder_favorites_label">"Suivis"</string>
     <string name="liveFolder_phones_label">"Téléphones"</string>
-    <string name="dialer_useDtmfDialpad">"Utiliser le clavier multifréquence"</string>
+    <string name="dialer_useDtmfDialpad">"Utiliser le clavier DTMF"</string>
     <string name="dialer_returnToInCallScreen">"Reprendre l\'appel en cours"</string>
     <string name="dialer_addAnotherCall">"Ajouter un appel"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b0a8f54..c54631d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Contatti"</string>
     <string name="shortcutContact">"Contatto"</string>
     <string name="starredList">"Speciali"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Usa la tastiera per la selezione a toni"</string>
     <string name="dialer_returnToInCallScreen">"Torna alla chiamata in corso"</string>
     <string name="dialer_addAnotherCall">"Aggiungi chiamata"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d5ec049..0c65789 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"連絡先"</string>
     <string name="shortcutContact">"連絡先"</string>
     <string name="starredList">"スター付き"</string>
@@ -62,7 +64,7 @@
     <string name="errorDialogTitle">"写真なし"</string>
     <string name="photoPickerNotFoundText">"使用できる写真が携帯電話にありません。"</string>
     <string name="attachToContact">"連絡先のアイコン"</string>
-    <string name="customLabelPickerTitle">"独自のラベル名"</string>
+    <string name="customLabelPickerTitle">"新しいラベル名"</string>
     <string name="menu_displayGroup">"グループを表示"</string>
     <string name="syncGroupPreference">"同期グループを編集"</string>
     <string name="importFromSim">"連絡先をインポート"</string>
@@ -95,7 +97,7 @@
     <string name="recentCallsIconLabel">"通話ログ"</string>
     <string name="liveFolderAll">"すべての連絡先"</string>
     <string name="liveFolderFavorites">"スター付きの連絡先"</string>
-    <string name="liveFolderPhone">"電話番号が登録されている連絡先"</string>
+    <string name="liveFolderPhone">"電話番号のある連絡先"</string>
     <string name="menu_sendTextMessage">"SMSメッセージを送信"</string>
     <string name="recentCalls_callNumber">"<xliff:g id="NAME">%s</xliff:g>さんに発信"</string>
     <string name="recentCalls_editNumberBeforeCall">"番号を編集して発信"</string>
@@ -108,7 +110,7 @@
     <string name="unknown">"不明"</string>
     <string name="private_num">"非通知番号"</string>
     <string name="dialerKeyboardHintText">"番号をキーボードから入力してください"</string>
-    <string name="dialerDialpadHintText">"ダイヤルして通話を追加します"</string>
+    <string name="dialerDialpadHintText">"ダイヤルして通話を追加"</string>
     <string name="simContacts_emptyLoading">"SIMカードからロードしています..."</string>
     <string name="simContacts_title">"SIMカードの連絡先"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Googleコンタクトと同期を取ります。"</font>" "\n"同期が終わると、いつでもこの携帯電話で連絡先を使用できます。"</string>
@@ -117,7 +119,27 @@
     <string name="liveFolder_all_label">"すべての連絡先"</string>
     <string name="liveFolder_favorites_label">"スター付き"</string>
     <string name="liveFolder_phones_label">"電話"</string>
-    <string name="dialer_useDtmfDialpad">"タッチ トーン キーパッドを使用する"</string>
+    <string name="dialer_useDtmfDialpad">"プッシュホン式キーパッドを使う"</string>
     <string name="dialer_returnToInCallScreen">"保留中の通話に戻る"</string>
-    <string name="dialer_addAnotherCall">"通話を追加"</string>
+    <string name="dialer_addAnotherCall">"別の通話を追加"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bf407f9..21c97f5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Contactpersonen"</string>
     <string name="shortcutContact">"Contactpersonen"</string>
     <string name="starredList">"Met ster"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Toetsen voor toonkiezen gebruiken"</string>
     <string name="dialer_returnToInCallScreen">"Terug naar actief gesprek"</string>
     <string name="dialer_addAnotherCall">"Oproep toevoegen"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 301b9dc..71422cc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Kontakty"</string>
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Oznaczony gwiazdką"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Użyj klawiatury tonowej"</string>
     <string name="dialer_returnToInCallScreen">"Powrót do aktywnego połączenia"</string>
     <string name="dialer_addAnotherCall">"Dodaj połączenie"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1c45a2d..fec3012 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"Контакты"</string>
     <string name="shortcutContact">"Контакт"</string>
     <string name="starredList">"Помеченные"</string>
@@ -108,7 +110,7 @@
     <string name="unknown">"Неизвестно"</string>
     <string name="private_num">"Частный номер"</string>
     <string name="dialerKeyboardHintText">"Для набора воспользуйтесь клавиатурой"</string>
-    <string name="dialerDialpadHintText">"Звонок для добавления вызова"</string>
+    <string name="dialerDialpadHintText">"Наберите номер для добавления вызова"</string>
     <string name="simContacts_emptyLoading">"Идет загрузка с SIM-карты…"</string>
     <string name="simContacts_title">"Контакты на SIM-карте"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Синхронизируйте свои контакты Google!"</font>" "\n"После синхронизации с телефоном вы сможете общаться со знакомыми, где бы вы ни были."</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"Использовать клавиатуру тонального набора"</string>
     <string name="dialer_returnToInCallScreen">"Отобразить текущий вызов"</string>
     <string name="dialer_addAnotherCall">"Добавить вызов"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0533f6b..05dfe31 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"联系人"</string>
     <string name="shortcutContact">"联系人"</string>
     <string name="starredList">"已加星标"</string>
@@ -95,7 +97,7 @@
     <string name="recentCallsIconLabel">"通话记录"</string>
     <string name="liveFolderAll">"所有联系人"</string>
     <string name="liveFolderFavorites">"已加星标的联系人"</string>
-    <string name="liveFolderPhone">"具有电话号码的联系人"</string>
+    <string name="liveFolderPhone">"有电话号码的联系人"</string>
     <string name="menu_sendTextMessage">"发送短信"</string>
     <string name="recentCalls_callNumber">"呼叫<xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="recentCalls_editNumberBeforeCall">"在呼叫之前编辑号码"</string>
@@ -120,4 +122,24 @@
     <string name="dialer_useDtmfDialpad">"使用按键式键盘"</string>
     <string name="dialer_returnToInCallScreen">"返回到正在进行中的通话"</string>
     <string name="dialer_addAnotherCall">"添加通话"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 016689c..d5fd578 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for applicationName (1951105221222584204) -->
+    <skip />
     <string name="contactsList">"連絡人"</string>
     <string name="shortcutContact">"連絡人"</string>
     <string name="starredList">"已標記星號"</string>
@@ -94,7 +96,7 @@
     <string name="dialerIconLabel">"撥號"</string>
     <string name="recentCallsIconLabel">"通話紀錄"</string>
     <string name="liveFolderAll">"全部聯絡人"</string>
-    <string name="liveFolderFavorites">"已加星號的聯絡人"</string>
+    <string name="liveFolderFavorites">"有星號標記的聯絡人"</string>
     <string name="liveFolderPhone">"有電話號碼的聯絡人"</string>
     <string name="menu_sendTextMessage">"傳送  SMS 訊息"</string>
     <string name="recentCalls_callNumber">"撥打電話給 <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -115,9 +117,29 @@
     <string name="noContactsHelpText">"您沒有任何連絡人。"\n\n" 若要新增連絡人，請按 "<font fgcolor="#ffffffff"><b>" [選單] "</b></font>"，並選取："\n\n"        "\n<li><font fgcolor="#ffffffff"><b>" [編輯同步處理群組] "</b></font>" 從新的或已存在的 Google 帳戶 "\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>" 新增連絡人 "</b></font>" 建立新的連絡人 "\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>" 匯入連絡人 "</b></font>" 從 SIM 卡新增連絡人 "\n</li></string>
     <string name="seclectSyncGroups_title">"選取要同步處理的群組"</string>
     <string name="liveFolder_all_label">"全部聯絡人"</string>
-    <string name="liveFolder_favorites_label">"已加星號"</string>
+    <string name="liveFolder_favorites_label">"星號標記"</string>
     <string name="liveFolder_phones_label">"電話"</string>
     <string name="dialer_useDtmfDialpad">"使用按鍵式鍵盤"</string>
     <string name="dialer_returnToInCallScreen">"返回進行中的通話"</string>
     <string name="dialer_addAnotherCall">"新增通話"</string>
+    <!-- no translation found for callDetailTitle (5340227785196217938) -->
+    <skip />
+    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
+    <skip />
+    <!-- no translation found for call_type (3213526349444862087) -->
+    <skip />
+    <!-- no translation found for type_incoming (6502076603836088532) -->
+    <skip />
+    <!-- no translation found for type_outgoing (343108709599392641) -->
+    <skip />
+    <!-- no translation found for type_missed (2720502601640509542) -->
+    <skip />
+    <!-- no translation found for call_time (5805575214626630975) -->
+    <skip />
+    <!-- no translation found for datetime_relative (2906207446040994658) -->
+    <skip />
+    <!-- no translation found for call_duration (3941950339482985532) -->
+    <skip />
+    <!-- no translation found for header_actions (229583643365836321) -->
+    <skip />
 </resources>
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 5a83090..593ae0f 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -626,14 +626,14 @@
         // Display group
         if (mDefaultMode) {
             menu.add(0, MENU_DISPLAY_GROUP, 0, R.string.menu_displayGroup)
-                    .setIcon(R.drawable.ic_menu_allfriends);
+                    .setIcon(com.android.internal.R.drawable.ic_menu_allfriends);
         }
 
         // Sync settings
         Intent syncIntent = new Intent(Intent.ACTION_VIEW);
         syncIntent.setClass(this, ContactsGroupSyncSelector.class);
         menu.add(0, 0, 0, R.string.syncGroupPreference)
-                .setIcon(android.R.drawable.ic_menu_refresh)
+                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
                 .setIntent(syncIntent);
         
         // SIM import