diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05b51cd..846551d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -57,7 +57,7 @@
 
         <!-- Tab container for TwelveKeyDialer and RecentCallsList -->
         <activity android:name="DialtactsActivity"
-            android:label="@string/dialerIconLabel"
+            android:label="@string/launcherDialer"
             android:theme="@android:style/Theme.NoTitleBar"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
diff --git a/res/drawable-finger/btn_circle_normal.png b/res/drawable-finger/btn_circle_normal.png
index 51268af..fc5af1c 100644
--- a/res/drawable-finger/btn_circle_normal.png
+++ b/res/drawable-finger/btn_circle_normal.png
Binary files differ
diff --git a/res/drawable-finger/btn_circle_selected.png b/res/drawable-finger/btn_circle_selected.png
index 0828a7b..c74fac2 100644
--- a/res/drawable-finger/btn_circle_selected.png
+++ b/res/drawable-finger/btn_circle_selected.png
Binary files differ
diff --git a/res/layout-finger/contacts_list_item.xml b/res/layout-finger/contacts_list_item.xml
index c48ed8a..e695f90 100644
--- a/res/layout-finger/contacts_list_item.xml
+++ b/res/layout-finger/contacts_list_item.xml
@@ -44,6 +44,7 @@
         android:layout_marginTop="-8dip"
 
         android:singleLine="true"
+        android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textStyle="bold"
     />
@@ -58,6 +59,7 @@
         android:layout_alignWithParentIfMissing="true"
 
         android:singleLine="true"
+        android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
     />
 
@@ -71,6 +73,8 @@
         android:layout_toLeftOf="@id/presence"
         android:layout_marginBottom="1dip"
 
+        android:singleLine="true"
+        android:ellipsize="marquee"
         android:gravity="center_vertical|left"
         android:textAppearance="?android:attr/textAppearanceLarge"
     />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0b0900d..e82b09b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Kontakty"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Označené hvězdičkou"</string>
     <string name="frequentList">"Časté"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"Načítání z karty SIM..."</string>
     <string name="simContacts_title">"Kontakty na kartě SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronizujte své kontakty Google!"</font>" "\n"Po synchronizaci telefonu budete mít kontaktní informace vždy u sebe."</string>
-    <string name="noContactsHelpText">"Nemáte žádné kontakty."\n\n"Chcete-li přidat kontakty, stiskněte tlačítko "<font fgcolor="#ffffffff"><b>"Nabídka"</b></font>" a vyberte možnost:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Upravit synchronizované skupiny"</b></font>", pokud chcete přidat kontakty z nového nebo existujícího účtu Google"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit nový kontakt"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importovat kontakty"</b></font>", pokud chcete přidat kontakty ze své SIM karty"\n</li></string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Vyberte skupiny, které chcete synchronizovat"</string>
     <string name="liveFolder_all_label">"Všechny kontakty"</string>
     <string name="liveFolder_favorites_label">"S hvězdičkou"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Budou odeslány přímo do hlasové pošty."</string>
     <string name="detailsRingtone">"Nastavit vyzvánění <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Zavolat zpět"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6757a8b..507d69d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Kontakte"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Markiert"</string>
     <string name="frequentList">"Häufig"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"Ladevorgang von SIM-Karte läuft..."</string>
     <string name="simContacts_title">"Kontakte auf SIM-Karte"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronisieren Sie Ihre Google-Kontakte!"</font>" "\n"Nach der Synchronisierung stehen Ihnen Ihre Kontakte überall zur Verfügung."</string>
-    <string name="noContactsHelpText">"Sie haben keine Kontakte."\n\n"Um Kontakte hinzuzufügen, klicken Sie auf "<font fgcolor="#ffffffff"><b>"Menü"</b></font>" und wählen Sie "\n\n" "\n<li><font fgcolor="#ffffffff"><b>"Synchronisierte Gruppen bearbeiten"</b></font>", um Kontakte aus einem neuen oder bestehenden Google-Konto hinzuzufügen,"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Neuer Kontakt"</b></font>", um einen ganz neuen Kontakt hinzuzufügen"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontakte importieren"</b></font>", um Kontakte von Ihrer SIM-Karte hinzuzufügen"\n</li></string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Zu synchronisierende Gruppen auswählen"</string>
     <string name="liveFolder_all_label">"Alle Kontakte"</string>
     <string name="liveFolder_favorites_label">"Markiert"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Wird direkt an Voicemail weitergeleitet"</string>
     <string name="detailsRingtone">"Eingestellt auf <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Rückruf"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ca9e2f9..f41406d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,6 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Contactos"</string>
+    <string name="launcherDialer">"Llamadas"</string>
     <string name="shortcutContact">"Contacto"</string>
     <string name="starredList">"Destacados"</string>
     <string name="frequentList">"Frecuentes"</string>
@@ -40,9 +41,8 @@
     <string name="menu_makeDefaultNumber">"Convertir en número predeterminado"</string>
     <string name="deleteConfirmation_title">"Suprimir"</string>
     <string name="deleteConfirmation">"El contacto se eliminará."</string>
-    <string name="menu_done">"Finalizado"</string>
-    <!-- no translation found for menu_doNotSave (2174577548513895144) -->
-    <skip />
+    <string name="menu_done">"Listo"</string>
+    <string name="menu_doNotSave">"Volver"</string>
     <string name="editContact_title_edit">"Editar contacto"</string>
     <string name="editContact_title_insert">"Contacto nuevo"</string>
     <string name="menu_addItem">"Más información"</string>
@@ -108,7 +108,7 @@
     <string name="listSeparatorMore_edit">"Más"</string>
     <string name="contactsIconLabel">"Contactos"</string>
     <string name="contactsFavoritesLabel">"Favoritos"</string>
-    <string name="dialerIconLabel">"Marcación"</string>
+    <string name="dialerIconLabel">"Llamar"</string>
     <string name="recentCallsIconLabel">"Registro de llamadas"</string>
     <string name="liveFolderAll">"Todos los contactos"</string>
     <string name="liveFolderFavorites">"Contactos destacados"</string>
@@ -129,7 +129,8 @@
     <string name="simContacts_emptyLoading">"Cargando desde tarjeta SIM…"</string>
     <string name="simContacts_title">"Contactos de tarjeta SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Sincroniza tus contactos de Google"</font>" "\n"Después de sincronizarlos con tu teléfono, podrás acceder a tus contactos desde cualquier lugar."</string>
-    <string name="noContactsHelpText">"No tienes ningún contacto."\n\n"Para añadir contactos, pulsa "<font fgcolor="#ffffffff"><b>"MENU"</b></font>" y selecciona:"\n\n" "\n<li><font fgcolor="#ffffffff"><b>"Editar grupos sincronizados"</b></font>" para añadirlos desde una cuenta de Google nueva o ya existente"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Nuevo contacto"</b></font>" para crear un contacto nuevo partiendo de cero"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadir nombres y números desde tu tarjeta SIM"\n</li></string>
+    <string name="noContactsHelpText">"No tienes contactos."\n\n"Para añadir contactos, pulsa la tecla  "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" y selecciona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para añadir un nuevo contacto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadir contactos de la tarjeta SIM"\n</li></string>
+    <string name="noContactsHelpTextWithSync">"No tienes contactos."\n\n"Para añadir contactos, pulsa la tecla "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" y selecciona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Editar grupos de sincronización"</b></font>" para añadirlos desde una cuenta de Google nueva o existente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un contacto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadir contactos de la tarjeta SIM"\n</li></string>
     <string name="seclectSyncGroups_title">"Seleccionar grupos para la sincronización"</string>
     <string name="liveFolder_all_label">"Todos los contactos"</string>
     <string name="liveFolder_favorites_label">"Destacados"</string>
@@ -150,12 +151,15 @@
     <string name="ringtone_spinner">"Tono de llamada: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
     <string name="add_more_items">"Añadir más elementos"</string>
     <string name="actionCall">"Llamar a <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionEmail">"Correo electrónico para <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Enviar un mensaje de texto a <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionEmail">"Enviar email a <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Enviar SMS a <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionChat">"Chatear mediante <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionMap">"Ver la dirección de <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionMap">"Ver dirección de <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionIncomingCall">"Llamadas entrantes"</string>
     <string name="detailIncomingCallsGoToVoicemail">"Pasarán directamente al correo de voz"</string>
     <string name="detailsRingtone">"Establecido como <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Volver a llamar"</string>
+    <string name="callAgain">"Llamar de nuevo"</string>
+    <string name="returnCall">"Devolver llamada"</string>
+    <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> seg."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f39e2de..ce00813 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,6 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Contacts"</string>
+    <string name="launcherDialer">"Appeler"</string>
     <string name="shortcutContact">"Contact"</string>
     <string name="starredList">"Marqués d\'une étoile"</string>
     <string name="frequentList">"Contacts fréquents"</string>
@@ -41,29 +42,28 @@
     <string name="deleteConfirmation_title">"Supprimer"</string>
     <string name="deleteConfirmation">"Ce contact sera supprimé."</string>
     <string name="menu_done">"OK"</string>
-    <!-- no translation found for menu_doNotSave (2174577548513895144) -->
-    <skip />
+    <string name="menu_doNotSave">"Annuler"</string>
     <string name="editContact_title_edit">"Modifier le contact"</string>
     <string name="editContact_title_insert">"Nouveau contact"</string>
     <string name="menu_addItem">"Plus d\'infos"</string>
     <string name="label_phonetic_name">"Prononciation phonétique"</string>
-    <string name="label_notes">"Remarques"</string>
+    <string name="label_notes">"Notes"</string>
     <string name="label_ringtone">"Sonnerie"</string>
     <string name="ghostData_name">"Nom et prénom"</string>
     <string name="ghostData_phonetic_name">"Nom phonétique"</string>
     <string name="ghostData_company">"Société"</string>
     <string name="ghostData_title">"Position"</string>
-    <string name="ghostData_im">"Nom du compte de MI"</string>
+    <string name="ghostData_im">"Nom du compte"</string>
     <string name="ghostData_notes">"Mon commentaire"</string>
     <string name="ghostData_phone">"Numéro téléphone"</string>
     <string name="ghostData_email">"Adresse e-mail"</string>
     <string name="ghostData_postal">"Adresse postale"</string>
     <string name="invalidContactMessage">"Ce contact n\'existe pas."</string>
     <string name="pickerNewContactHeader">"Créer un nouveau contact"</string>
-    <string name="selectLabel">"Sélectionner un libellé"</string>
+    <string name="selectLabel">"Sélectionnez un libellé"</string>
     <string name="phoneLabelsGroup">"Téléphone"</string>
     <string name="emailLabelsGroup">"E-mail"</string>
-    <string name="imLabelsGroup">"MI"</string>
+    <string name="imLabelsGroup">"Chat"</string>
     <string name="postalLabelsGroup">"Adresse postale"</string>
     <string name="otherLabelsGroup">"Autre"</string>
   <string-array name="otherLabels">
@@ -75,9 +75,9 @@
     <string name="attachToContact">"Icône de contact"</string>
     <string name="customLabelPickerTitle">"Libellé personnalisé"</string>
     <string name="menu_displayGroup">"Afficher les groupes"</string>
-    <string name="syncGroupPreference">"Paramètres de sync. des groupes"</string>
+    <string name="syncGroupPreference">"Param. sync. groupes"</string>
     <string name="importFromSim">"Importer des contacts"</string>
-    <string name="send_to_voicemail_checkbox">"Envoyer les appels directement en tant que message vocal"</string>
+    <string name="send_to_voicemail_checkbox">"Renvoyer les appels directement vers la boîte vocale."</string>
     <string name="send_to_voicemail_view">"Les appels sont renvoyés directement vers la boîte vocale."</string>
     <string name="default_ringtone">"Par défaut"</string>
     <string name="addPicture">"Ajouter une icône"</string>
@@ -108,7 +108,7 @@
     <string name="listSeparatorMore_edit">"Plus"</string>
     <string name="contactsIconLabel">"Contacts"</string>
     <string name="contactsFavoritesLabel">"Favoris"</string>
-    <string name="dialerIconLabel">"Composer"</string>
+    <string name="dialerIconLabel">"Appeler"</string>
     <string name="recentCallsIconLabel">"Appels"</string>
     <string name="liveFolderAll">"Tous les contacts"</string>
     <string name="liveFolderFavorites">"Contacts suivis"</string>
@@ -119,7 +119,7 @@
     <string name="recentCalls_addToContact">"Ajouter aux contacts"</string>
     <string name="recentCalls_removeFromRecentList">"Supprimer de la liste des appels"</string>
     <string name="recentCalls_deleteAll">"Effacer tous les appels"</string>
-    <string name="recentCalls_empty">"Aucun appel enregistré."</string>
+    <string name="recentCalls_empty">"Aucun appel."</string>
     <string name="imei">"IMEI"</string>
     <string name="voicemail">"Boîte vocale"</string>
     <string name="unknown">"Inconnu"</string>
@@ -129,7 +129,8 @@
     <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"Vos contacts seront disponibles, où que vous soyez, dès que vous aurez synchronisé votre téléphone."</string>
-    <string name="noContactsHelpText">"Vous n\'avez aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n\n" "\n<li><font fgcolor="#ffffffff"><b>"Paramètres de sync. des groupes"</b></font>" pour ajouter un contact à partir d\'un nouveau compte Google ou d\'un compte existant"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact"\n</li>\n" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM"\n</li></string>
+    <string name="noContactsHelpText">"Aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un tout nouveau contact"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM"\n</li></string>
+    <string name="noContactsHelpTextWithSync">"Aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Param. sync. groupes"</b></font>" pour ajouter des contacts depuis un nouveau compte Google ou un compte existant."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un tout nouveau contact"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM"\n</li></string>
     <string name="seclectSyncGroups_title">"Sélectionner les groupes à synchroniser"</string>
     <string name="liveFolder_all_label">"Tous les contacts"</string>
     <string name="liveFolder_favorites_label">"Suivis"</string>
@@ -151,11 +152,14 @@
     <string name="add_more_items">"Ajouter d\'autres éléments"</string>
     <string name="actionCall">"Appeler <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionEmail">"Envoyer un e-mail à <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Envoyer un message texte à <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Envoyer un SMS à <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionChat">"Chatter à l\'aide de <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionMap">"Afficher l\'adresse <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionIncomingCall">"Appels entrants"</string>
     <string name="detailIncomingCallsGoToVoicemail">"Seront envoyés directement en tant que message vocal"</string>
     <string name="detailsRingtone">"Associer à <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Rappeler"</string>
+    <string name="callAgain">"Rappeler"</string>
+    <string name="returnCall">"Rappeler"</string>
+    <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> mn <xliff:g id="SECONDS">%s</xliff:g> s"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 90272be..59064f0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,6 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Contatti"</string>
+    <string name="launcherDialer">"Telefono"</string>
     <string name="shortcutContact">"Contatto"</string>
     <string name="starredList">"Speciali"</string>
     <string name="frequentList">"Frequenti"</string>
@@ -40,9 +41,8 @@
     <string name="menu_makeDefaultNumber">"Rendi numero predefinito"</string>
     <string name="deleteConfirmation_title">"Elimina"</string>
     <string name="deleteConfirmation">"Il contatto verrà eliminato."</string>
-    <string name="menu_done">"Completato"</string>
-    <!-- no translation found for menu_doNotSave (2174577548513895144) -->
-    <skip />
+    <string name="menu_done">"Salva"</string>
+    <string name="menu_doNotSave">"Annulla"</string>
     <string name="editContact_title_edit">"Modifica contatto"</string>
     <string name="editContact_title_insert">"Nuovo contatto"</string>
     <string name="menu_addItem">"Altre info"</string>
@@ -53,7 +53,7 @@
     <string name="ghostData_phonetic_name">"Nome fonetico"</string>
     <string name="ghostData_company">"Società"</string>
     <string name="ghostData_title">"Mansione"</string>
-    <string name="ghostData_im">"Nome IM"</string>
+    <string name="ghostData_im">"Nome account chat"</string>
     <string name="ghostData_notes">"La mia nota"</string>
     <string name="ghostData_phone">"Numero di telefono"</string>
     <string name="ghostData_email">"Indirizzo email"</string>
@@ -63,7 +63,7 @@
     <string name="selectLabel">"Seleziona etichetta"</string>
     <string name="phoneLabelsGroup">"Telefono"</string>
     <string name="emailLabelsGroup">"Email"</string>
-    <string name="imLabelsGroup">"IM"</string>
+    <string name="imLabelsGroup">"Chat"</string>
     <string name="postalLabelsGroup">"Indirizzo postale"</string>
     <string name="otherLabelsGroup">"Altro"</string>
   <string-array name="otherLabels">
@@ -77,7 +77,7 @@
     <string name="menu_displayGroup">"Visualizza gruppo"</string>
     <string name="syncGroupPreference">"Modifica sincr. gruppi"</string>
     <string name="importFromSim">"Importa contatti"</string>
-    <string name="send_to_voicemail_checkbox">"Inoltra le chiamate direttamente alla posta vocale"</string>
+    <string name="send_to_voicemail_checkbox">"Inoltra chiamate direttamente alla segreteria"</string>
     <string name="send_to_voicemail_view">"Le chiamate vengono inoltrate direttamente alla segreteria."</string>
     <string name="default_ringtone">"Predefinita"</string>
     <string name="addPicture">"Aggiungi icona"</string>
@@ -98,7 +98,7 @@
     <string name="listSeparatorSendSmsMms">"Invia SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"Invia email"</string>
     <string name="listSeparatorSendEmail_edit">"Indirizzi email"</string>
-    <string name="listSeparatorSendIm">"Invia msg IM"</string>
+    <string name="listSeparatorSendIm">"Invia messagio chat"</string>
     <string name="listSeparatorSendIm_edit">"Indirizzi chat"</string>
     <string name="listSeparatorMapAddress">"Indirizzo su mappa"</string>
     <string name="listSeparatorMapAddress_edit">"Indirizzi postali"</string>
@@ -108,16 +108,16 @@
     <string name="listSeparatorMore_edit">"Altro"</string>
     <string name="contactsIconLabel">"Contatti"</string>
     <string name="contactsFavoritesLabel">"Preferiti"</string>
-    <string name="dialerIconLabel">"Dialer"</string>
+    <string name="dialerIconLabel">"Telefono"</string>
     <string name="recentCallsIconLabel">"Reg. chiamate"</string>
     <string name="liveFolderAll">"Tutti i contatti"</string>
     <string name="liveFolderFavorites">"Contatti speciali"</string>
     <string name="liveFolderPhone">"Contatti con numeri di telefono"</string>
     <string name="menu_sendTextMessage">"Invia SMS"</string>
     <string name="recentCalls_callNumber">"Chiama <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="recentCalls_editNumberBeforeCall">"Modifica numero prima di chiamare"</string>
+    <string name="recentCalls_editNumberBeforeCall">"Modifica prima di chiamare"</string>
     <string name="recentCalls_addToContact">"Aggiungi a contatti"</string>
-    <string name="recentCalls_removeFromRecentList">"Rimuovi da registro chiamate"</string>
+    <string name="recentCalls_removeFromRecentList">"Rimuovi da registro"</string>
     <string name="recentCalls_deleteAll">"Cancella registro chiamate"</string>
     <string name="recentCalls_empty">"Il registro chiamate è vuoto."</string>
     <string name="imei">"IMEI"</string>
@@ -129,14 +129,15 @@
     <string name="simContacts_emptyLoading">"Caricamento da SIM..."</string>
     <string name="simContacts_title">"Contatti SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Sincronizza i tuoi contatti Google."</font>" "\n"Dopo la sincronizzazione con il telefono, i tuoi contatti saranno sempre a tua disposizione."</string>
-    <string name="noContactsHelpText">"Non è presente alcun contatto. "\n\n"Per aggiungere contatti, premi "<font fgcolor="#ffffffff"><b>" Menu"</b></font>" e seleziona: "\n\n"      "\n<li><font fgcolor="#ffffffff"><b>"Modifica sincronizza gruppi"</b></font>"  per aggiungere contatti da un account Google nuovo o da uno esistente"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare un contatto partendo da zero"\n</li>\n"        "\n<li><font fgcolor="#ffffffff">"Importa "<b>"contatti"</b></font>" per aggiungere contatti dalla tua SIM card  "\n</li></string>
+    <string name="noContactsHelpText">"Non hai nessun contatto."\n\n"Per aggiungere dei contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e seleziona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare un nuovo contatto"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importa contatti"</b></font>" per aggiungere i contatti salvati sulla scheda SIM card"\n</li></string>
+    <string name="noContactsHelpTextWithSync">"Non hai nessun contatto."\n\n"Per aggiungere i contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e seleziona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Modifica sincr. gruppi"</b></font>" per aggiungere contatti da un account Google nuovo o già esistente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare un contatto nuovo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importa contatti"</b></font>" per aggiungere i contatti salvati sulla scheda SIM"\n</li></string>
     <string name="seclectSyncGroups_title">"Seleziona i gruppi da sincronizzare"</string>
     <string name="liveFolder_all_label">"Tutti i contatti"</string>
     <string name="liveFolder_favorites_label">"Speciali"</string>
     <string name="liveFolder_phones_label">"Telefoni"</string>
-    <string name="dialer_useDtmfDialpad">"Usa la tastiera per la selezione a toni"</string>
+    <string name="dialer_useDtmfDialpad">"Usa tastierino per selezione a toni"</string>
     <string name="dialer_returnToInCallScreen">"Torna alla chiamata in corso"</string>
-    <string name="dialer_addAnotherCall">"Aggiungi chiamata"</string>
+    <string name="dialer_addAnotherCall">"Aggiungi"</string>
     <string name="callDetailTitle">"Dettagli chiamata"</string>
     <string name="toast_call_detail_error">"Impossibile leggere i dettagli per la chiamata richiesta."</string>
     <string name="call_type">"Tipo"</string>
@@ -148,14 +149,17 @@
     <string name="call_duration">"Durata"</string>
     <string name="header_actions">"Azioni"</string>
     <string name="ringtone_spinner">"Suoneria: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
-    <string name="add_more_items">"Aggiungi ulteriori elementi"</string>
-    <string name="actionCall">"Chiama <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionEmail">"Invia email a <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Invia testo a <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionChat">"Chat tramite <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="add_more_items">"Aggiungi altri elementi"</string>
+    <string name="actionCall">"Chiama n. <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionEmail">"Invia email a ind. <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Invia SMS a n. <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionChat">"Chatta su <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionMap">"Visualizza indirizzo <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionIncomingCall">"Chiamate in arrivo"</string>
-    <string name="detailIncomingCallsGoToVoicemail">"Il messaggio verrà inviato direttamente alla posta vocale"</string>
+    <string name="detailIncomingCallsGoToVoicemail">"Il messaggio verrà inviato direttamente alla segreteria"</string>
     <string name="detailsRingtone">"Impostato su <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Richiama"</string>
+    <string name="callAgain">"Richiama"</string>
+    <string name="returnCall">"Chiama numero"</string>
+    <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5595643..117c015 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"連絡先"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"連絡先"</string>
     <string name="starredList">"スター付き"</string>
     <string name="frequentList">"よく連絡する連絡先"</string>
@@ -125,11 +127,14 @@
     <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"Googleサービスで使っている連絡先をこの携帯電話でも使えるようになります。"</string>
-    <string name="noContactsHelpText">"連絡先がありません。"\n\n"連絡先を追加するには、"<font fgcolor="#ffffffff"><b>"メニュー"</b></font>"を押して"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Edit sync groups"</b></font>"を選択し、新規か既存のGoogleアカウント"\n</li>\n"を追加します。        "\n<li><font fgcolor="#ffffffff"><b>"新規連絡先"</b></font>"を選択すると新しい連絡先をはじめから作成できます。"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Import contacts"</b></font>"を選択すると連絡先をSIMカードから追加できます。"\n</li></string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"同期するグループを選択"</string>
     <string name="liveFolder_all_label">"すべての連絡先"</string>
     <string name="liveFolder_favorites_label">"スター付き"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"直接ボイスメールに送信します"</string>
     <string name="detailsRingtone">"<xliff:g id="RINGTONE_NAME">%s</xliff:g>に設定"</string>
     <string name="callBack">"コールバック"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 61c7169..aafe0d0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"연락처"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"연락처"</string>
     <string name="starredList">"별표 표시된 연락처"</string>
     <string name="frequentList">"자주 거는 전화"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"SIM 카드에서 로드 중…"</string>
     <string name="simContacts_title">"SIM 카드 연락처"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Google 연락처를 동기화하세요."</font>" "\n"연락처를 전화기로 동기화하면 어디에서나 연락처를 확인할 수 있습니다."</string>
-    <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>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"동기화할 그룹 선택"</string>
     <string name="liveFolder_all_label">"전체 주소록"</string>
     <string name="liveFolder_favorites_label">"중요편지함"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"음성메일로 바로 보냄"</string>
     <string name="detailsRingtone">"<xliff:g id="RINGTONE_NAME">%s</xliff:g>(으)로 설정"</string>
     <string name="callBack">"콜백"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index aa8fcc6..3b47bac 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,6 +16,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Kontakter"</string>
+    <string name="launcherDialer">"Telefon"</string>
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Med stjerne"</string>
     <string name="frequentList">"Mest brukt"</string>
@@ -86,7 +87,7 @@
     <string name="noContactsWithPhoneNumbers">"Ingen kontakter med telefonnummer."</string>
     <string name="noFavorites">"Ingen favoritter."</string>
     <string name="select_group_title">"Grupper"</string>
-    <string name="groupEmpty">"Gruppen \\\\\\\"<xliff:g id="GROUPNAME">%s</xliff:g>\\\\\\\" er tom."</string>
+    <string name="groupEmpty">"Gruppen \"<xliff:g id="GROUPNAME">%s</xliff:g>\" er tom."</string>
     <string name="showAllGroups">"Alle kontakter"</string>
     <string name="syncAllGroups">"Synkroniser alle kontakter"</string>
     <string name="groupNameMyContacts">"Mine kontakter"</string>
@@ -129,7 +130,10 @@
     <string name="simContacts_emptyLoading">"Henter fra SIM-kort…"</string>
     <string name="simContacts_title">"Kontakter på SIM-kort"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synkroniser Google-kontaktene dine!"</font>" "\n"Etter å ha synkronisert telefonen vil kontaktene dine bli tilgjengelig overalt."</string>
-    <string name="noContactsHelpText">"Du har ingen kontakter."\n\n"Legg til kontakter ved å trykke på "<font fgcolor="#ffffffff"><b>"Menu (Meny)"</b></font>" og velge:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Edit sync groups (Rediger synkroniseringsgrupper)"</b></font>" for å legge til en ny eller eksisterende Google-konto"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"New contact (Ny kontakt)"</b></font>" for å legge til en ny kontakt helt fra begynnelsen av"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Import contacts (Importer kontakter)"</b></font>" for å legge til kontakter fra SIM-kortet"\n</li></string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Velg grupper som skal synkroniseres"</string>
     <string name="liveFolder_all_label">"Alle kontakter"</string>
     <string name="liveFolder_favorites_label">"Med stjerne"</string>
@@ -158,4 +162,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Vil bli sendt rett til telefonsvarer"</string>
     <string name="detailsRingtone">"Sett til <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Ring tilbake"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2d05c2b..0d3a556 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,8 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="contactsList">"Contactpersonen"</string>
-    <string name="shortcutContact">"Contactpersonen"</string>
+    <string name="contactsList">"Contacten"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
+    <string name="shortcutContact">"Contacten"</string>
     <string name="starredList">"Met ster"</string>
     <string name="frequentList">"Vaak"</string>
     <string name="strequentList">"Favorieten"</string>
@@ -24,7 +26,7 @@
     <string name="viewContactDesription">"Contactpersoon weergeven"</string>
     <string name="editContactDescription">"Contactpersoon bewerken"</string>
     <string name="insertContactDescription">"Contactpersoon maken"</string>
-    <string name="searchHint">"Contactpersonen zoeken"</string>
+    <string name="searchHint">"Contacten zoeken"</string>
     <string name="menu_newContact">"Nieuwe contactpersoon"</string>
     <string name="menu_viewContact">"Contactpersoon weergeven"</string>
     <string name="menu_callNumber">"<xliff:g id="NAME">%s</xliff:g> bellen"</string>
@@ -76,21 +78,21 @@
     <string name="customLabelPickerTitle">"Aangepaste labelnaam"</string>
     <string name="menu_displayGroup">"Groep weergeven"</string>
     <string name="syncGroupPreference">"Synchronisatiegroepen bewerken"</string>
-    <string name="importFromSim">"Contactpersonen importeren"</string>
+    <string name="importFromSim">"Contacten importeren"</string>
     <string name="send_to_voicemail_checkbox">"Oproepen rechtstreeks naar voicemail verzenden"</string>
     <string name="send_to_voicemail_view">"Oproepen worden rechtstreeks naar voicemail verzonden."</string>
     <string name="default_ringtone">"Standaard"</string>
     <string name="addPicture">"Pictogram toevoegen"</string>
     <string name="removePicture">"Pictogram verwijderen"</string>
-    <string name="noContacts">"Geen contactpersonen."</string>
-    <string name="noContactsWithPhoneNumbers">"Geen contactpersonen met telefoonnummers."</string>
+    <string name="noContacts">"Geen contacten."</string>
+    <string name="noContactsWithPhoneNumbers">"Geen contacten met telefoonnummers."</string>
     <string name="noFavorites">"Geen favorieten."</string>
     <string name="select_group_title">"Groepen"</string>
     <string name="groupEmpty">"De groep \'<xliff:g id="GROUPNAME">%s</xliff:g>\' is leeg."</string>
-    <string name="showAllGroups">"Alle contactpersonen"</string>
-    <string name="syncAllGroups">"Alle contactpersonen synchroniseren"</string>
-    <string name="groupNameMyContacts">"Mijn contactpersonen"</string>
-    <string name="groupNameWithPhones">"Contactpersonen met telefoonnummers"</string>
+    <string name="showAllGroups">"Alle contacten"</string>
+    <string name="syncAllGroups">"Alle contacten synchroniseren"</string>
+    <string name="groupNameMyContacts">"Mijn contacten"</string>
+    <string name="groupNameWithPhones">"Contacten met telefoonnummers"</string>
     <string name="contactCreatedToast">"Contactpersoon is gemaakt."</string>
     <string name="contactSavedToast">"Contactpersoon opgeslagen."</string>
     <string name="listSeparatorCallNumber">"Nummer bellen"</string>
@@ -106,20 +108,20 @@
     <string name="listSeparatorOtherInformation">"Overige informatie"</string>
     <string name="listSeparatorOtherInformation_edit">"Andere opties"</string>
     <string name="listSeparatorMore_edit">"Meer"</string>
-    <string name="contactsIconLabel">"Contactpersonen"</string>
+    <string name="contactsIconLabel">"Contacten"</string>
     <string name="contactsFavoritesLabel">"Favorieten"</string>
-    <string name="dialerIconLabel">"Dialer"</string>
-    <string name="recentCallsIconLabel">"Gesprekslogboek"</string>
-    <string name="liveFolderAll">"Alle contactpersonen"</string>
-    <string name="liveFolderFavorites">"Contactpersonen met ster"</string>
-    <string name="liveFolderPhone">"Contactpersonen met telefoonnummers"</string>
+    <string name="dialerIconLabel">"Telefoon"</string>
+    <string name="recentCallsIconLabel">"Gesprekken"</string>
+    <string name="liveFolderAll">"Alle contacten"</string>
+    <string name="liveFolderFavorites">"Contacten met ster"</string>
+    <string name="liveFolderPhone">"Contacten met telefoonnummers"</string>
     <string name="menu_sendTextMessage">"SMS-bericht verzenden"</string>
     <string name="recentCalls_callNumber">"<xliff:g id="NAME">%s</xliff:g> bellen"</string>
     <string name="recentCalls_editNumberBeforeCall">"Nummer bewerken voor bellen"</string>
-    <string name="recentCalls_addToContact">"Toevoegen aan contactpersonen"</string>
-    <string name="recentCalls_removeFromRecentList">"Verwijderen uit gesprekslogboek"</string>
-    <string name="recentCalls_deleteAll">"Gesprekslogboek wissen"</string>
-    <string name="recentCalls_empty">"Gesprekslogboek is leeg."</string>
+    <string name="recentCalls_addToContact">"Toevoegen aan contacten"</string>
+    <string name="recentCalls_removeFromRecentList">"Verwijderen uit Gesprekken"</string>
+    <string name="recentCalls_deleteAll">"Gesprekken wissen"</string>
+    <string name="recentCalls_empty">"Gesprekken is leeg"</string>
     <string name="imei">"IMEI"</string>
     <string name="voicemail">"Voicemail"</string>
     <string name="unknown">"Onbekend"</string>
@@ -127,11 +129,14 @@
     <string name="dialerKeyboardHintText">"Toetsen gebruiken om te bellen"</string>
     <string name="dialerDialpadHintText">"Bellen om een oproep toe te voegen"</string>
     <string name="simContacts_emptyLoading">"Laden vanaf SIM-kaart..."</string>
-    <string name="simContacts_title">"Contactpersonen op SIM-kaart"</string>
-    <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchroniseer uw Google-contactpersonen!"</font>" "\n"Zodra uw telefoon is gesynchroniseerd, heeft u uw contactpersonen altijd ter beschikking."</string>
-    <string name="noContactsHelpText">"Je hebt geen contactpersonen."\n\n"Als je contactpersonen wilt toevoegen, klik je op "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" en selecteer je:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"\'Synchronisatiegroepen bewerken\'"</b></font>" om contactpersonen toe te voegen uit een nieuwe of bestaande Google-account"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"\'Nieuwe contactpersoon\'"</b></font>" om een geheel nieuwe contactpersoon te maken"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"\'Contactpersonen importeren\'"</b></font>" om contactpersonen te importeren vanaf je SIM-kaart"\n</li></string>
+    <string name="simContacts_title">"Contacten op SIM-kaart"</string>
+    <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchroniseer uw Google-contacten!"</font>" "\n"Zodra uw telefoon is gesynchroniseerd, heeft u uw contacten altijd ter beschikking."</string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Groepen selecteren om te synchroniseren"</string>
-    <string name="liveFolder_all_label">"Alle contactpersonen"</string>
+    <string name="liveFolder_all_label">"Alle contacten"</string>
     <string name="liveFolder_favorites_label">"Met ster"</string>
     <string name="liveFolder_phones_label">"Telefoons"</string>
     <string name="dialer_useDtmfDialpad">"Toetsen voor toonkiezen gebruiken"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Wordt direct naar voicemail verzonden"</string>
     <string name="detailsRingtone">"Ingesteld op <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Terugbellen"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aff45c3..feb5c8b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Kontakty"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"Kontakt"</string>
     <string name="starredList">"Oznaczony gwiazdką"</string>
     <string name="frequentList">"Częste"</string>
@@ -75,7 +77,7 @@
     <string name="attachToContact">"Ikona kontaktu"</string>
     <string name="customLabelPickerTitle">"Nazwa etykiety niestandardowej"</string>
     <string name="menu_displayGroup">"Wyświetl grupę"</string>
-    <string name="syncGroupPreference">"Edytuj grupy synchronizacji"</string>
+    <string name="syncGroupPreference">"Synchronizacja grup"</string>
     <string name="importFromSim">"Importuj kontakty"</string>
     <string name="send_to_voicemail_checkbox">"Przekieruj połączenia bezpośrednio na pocztę głosową"</string>
     <string name="send_to_voicemail_view">"Połączenia są przekazywane bezpośrednio do poczty głosowej."</string>
@@ -108,10 +110,10 @@
     <string name="listSeparatorMore_edit">"Więcej"</string>
     <string name="contactsIconLabel">"Kontakty"</string>
     <string name="contactsFavoritesLabel">"Ulubione"</string>
-    <string name="dialerIconLabel">"Klawisze"</string>
-    <string name="recentCallsIconLabel">"Rejestr połączeń"</string>
+    <string name="dialerIconLabel">"Telefon"</string>
+    <string name="recentCallsIconLabel">"Rejestr"</string>
     <string name="liveFolderAll">"Wszystkie kontakty"</string>
-    <string name="liveFolderFavorites">"Kontakty oznaczone gwiazdkami"</string>
+    <string name="liveFolderFavorites">"Kontakty oznaczone gwiazdką"</string>
     <string name="liveFolderPhone">"Kontakty z numerami telefonów"</string>
     <string name="menu_sendTextMessage">"Wyślij wiadomość SMS"</string>
     <string name="recentCalls_callNumber">"Zadzwoń do kontaktu <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -129,10 +131,13 @@
     <string name="simContacts_emptyLoading">"Wczytywanie z karty SIM…"</string>
     <string name="simContacts_title">"Kontakty z karty SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Zsynchronizuj kontakty Google!"</font>" "\n"Po zsynchronizowaniu telefonu zawsze będziesz mieć kontakty pod ręką."</string>
-    <string name="noContactsHelpText">"Nie masz żadnych kontaktów."\n\n"Aby dodać kontakty, naciśnij opcję "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" i wybierz polecenie:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Edytuj grupy synchronizowane"</b></font>" w celu dodania kontaktów z nowego lub istniejącego konta Google"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nowy kontakt"</b></font>" w celu utworzenia nowego kontaktu od początku"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importuj kontakty"</b></font>" w celu dodania kontaktów z karty SIM"\n</li></string>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Wybierz grupy do zsynchronizowania"</string>
     <string name="liveFolder_all_label">"Wszystkie kontakty"</string>
-    <string name="liveFolder_favorites_label">"Oznaczone gwiazdkami"</string>
+    <string name="liveFolder_favorites_label">"Oznaczone gwiazdką"</string>
     <string name="liveFolder_phones_label">"Telefony"</string>
     <string name="dialer_useDtmfDialpad">"Użyj klawiatury tonowej"</string>
     <string name="dialer_returnToInCallScreen">"Powrót do aktywnego połączenia"</string>
@@ -140,7 +145,7 @@
     <string name="callDetailTitle">"Szczegóły połączenia"</string>
     <string name="toast_call_detail_error">"Nie można odczytać szczegółów żądanego połączenia."</string>
     <string name="call_type">"Typ"</string>
-    <string name="type_incoming">"Połączenie przychodzące"</string>
+    <string name="type_incoming">"Poł. przychodzące"</string>
     <string name="type_outgoing">"Połączenie wychodzące"</string>
     <string name="type_missed">"Nieodebrane połączenia"</string>
     <string name="call_time">"Godzina"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Zostaną wysłane bezpośrednio na pocztę głosową"</string>
     <string name="detailsRingtone">"Ustaw na <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Oddzwoń"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index de8ed6a..398c898 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"Контакты"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"Контакт"</string>
     <string name="starredList">"Помеченные"</string>
     <string name="frequentList">"Частые"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"Идет загрузка с SIM-карты…"</string>
     <string name="simContacts_title">"Контакты на SIM-карте"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Синхронизируйте свои контакты Google!"</font>" "\n"После синхронизации с телефоном вы сможете общаться со знакомыми, где бы вы ни были."</string>
-    <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>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"Выбор групп для синхронизации"</string>
     <string name="liveFolder_all_label">"Все контакты"</string>
     <string name="liveFolder_favorites_label">"Помеченные"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"Переадресация в голосовую почту"</string>
     <string name="detailsRingtone">"Выбрано: <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Перезвонить"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c613728..6ef964e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"联系人"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"联系人"</string>
     <string name="starredList">"已加星标"</string>
     <string name="frequentList">"经常"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"正在从 SIM 卡中载入..."</string>
     <string name="simContacts_title">"SIM 卡联系人"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"同步您的 Google 联系人！"</font>\n"将联系人同步到您的手机后，无论您走到哪里，都可以与他们联系。"</string>
-    <string name="noContactsHelpText">"您还没有联系人。"\n\n"要添加联系人，请按"<font fgcolor="#ffffffff"><b>"菜单"</b></font>"，然后选择："\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"修改同步组"</b></font>"可以从新的 Google 帐户或现有 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>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"选择要同步的组"</string>
     <string name="liveFolder_all_label">"所有联系人"</string>
     <string name="liveFolder_favorites_label">"已加星标"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"将直接发送至语音邮件"</string>
     <string name="detailsRingtone">"设置为“<xliff:g id="RINGTONE_NAME">%s</xliff:g>”"</string>
     <string name="callBack">"回拨"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 80dda3f..91704fb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,6 +16,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList">"連絡人"</string>
+    <!-- no translation found for launcherDialer (140610573639849799) -->
+    <skip />
     <string name="shortcutContact">"連絡人"</string>
     <string name="starredList">"已標記星號"</string>
     <string name="frequentList">"經常聯絡"</string>
@@ -129,7 +131,10 @@
     <string name="simContacts_emptyLoading">"從  SIM 卡讀取中…"</string>
     <string name="simContacts_title">"SIM 卡連絡人"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">" 同步處理您的 Google 連絡人！"</font>" "\n" 與手機同步處理後，無論您走到哪，都可存取連絡人資訊。"</string>
-    <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>
+    <!-- no translation found for noContactsHelpText (2249195687463896364) -->
+    <skip />
+    <!-- no translation found for noContactsHelpTextWithSync (4927701496550314555) -->
+    <skip />
     <string name="seclectSyncGroups_title">"選取要同步處理的群組"</string>
     <string name="liveFolder_all_label">"全部聯絡人"</string>
     <string name="liveFolder_favorites_label">"星號標記"</string>
@@ -158,4 +163,10 @@
     <string name="detailIncomingCallsGoToVoicemail">"來電將直接轉到語音信箱"</string>
     <string name="detailsRingtone">"設為<xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"回播電話"</string>
+    <!-- no translation found for callAgain (3197312117049874778) -->
+    <skip />
+    <!-- no translation found for returnCall (8171961914203617813) -->
+    <skip />
+    <!-- no translation found for callDetailsDurationFormat (8157706382818184268) -->
+    <skip />
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66256f0..b63d8c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,6 +19,10 @@
          used in the Launcher icon. -->
     <string name="contactsList">Contacts</string>
 
+    <!-- Title for the activity that dials the phone.  This is the name
+         used in the Launcher icon. -->
+    <string name="launcherDialer">Dialer</string>
+
     <!-- Name of activity that allows users to create shortcuts on the home screen to a contact.
          This shows up in a list of things like bookmark, folder, music playlist, etc -->
     <string name="shortcutContact">Contact</string>
@@ -51,6 +55,9 @@
     <!-- Hint text in the search box when the user hits the Search key while in the contacts app -->
     <string name="searchHint">Search contacts</string>
 
+    <!-- Menu item to search contacts -->
+    <string name="menu_search">Search</string>
+
     <!-- Menu item to create a new contact -->
     <string name="menu_newContact">New contact</string>
 
diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index ada4778..012a33e 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -79,7 +79,7 @@
     
     static final String[] PHONES_PROJECTION = new String[] {
         Phones.PERSON_ID,
-        Phones.NAME,
+        Phones.DISPLAY_NAME,
         Phones.TYPE,
         Phones.LABEL,
         Phones.NUMBER,
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 6fad5a9..6e72fbd 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -57,8 +57,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AlphabetIndexer;
+import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ResourceCursorAdapter;
@@ -87,6 +89,7 @@
     static final int MENU_ITEM_DELETE = 7;
     static final int MENU_ITEM_TOGGLE_STAR = 8;
 
+    public static final int MENU_SEARCH = 1;
     public static final int MENU_DIALER = 9;
     public static final int MENU_NEW_CONTACT = 10;
     public static final int MENU_DISPLAY_GROUP = 11;
@@ -587,13 +590,22 @@
             }
         }
 
-        if (runQuery) {
-            // Calling requery here may cause an ANR, so always do the async query
+        if (mJustCreated && runQuery) {
+            // We need to start a query here the first time the activity is launched, as long
+            // as we aren't doing a filter.
             startQuery();
         }
         mJustCreated = false;
     }
     
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+
+        // The cursor was killed off in onStop(), so we need to get a new one here
+        startQuery();
+    }
+    
     private void updateGroup() {
         if (mDefaultMode) {
             setDefaultMode();
@@ -625,7 +637,7 @@
 
         // We don't want the list to display the empty state, since when we resume it will still
         // be there and show up while the new query is happening. After the async query finished
-        // in response to onResume() setLoading(false) will be called.
+        // in response to onRestart() setLoading(false) will be called.
         mAdapter.setLoading(true);
         mAdapter.changeCursor(null);
 
@@ -644,6 +656,10 @@
             return false;
         }
 
+        // Search
+        menu.add(0, MENU_SEARCH, 0, R.string.menu_search)
+                .setIcon(android.R.drawable.ic_menu_search);
+
         // New contact
         menu.add(0, MENU_NEW_CONTACT, 0, R.string.menu_newContact)
                 .setIcon(android.R.drawable.ic_menu_add)
@@ -720,16 +736,21 @@
     
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == MENU_DISPLAY_GROUP) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                .setTitle(R.string.select_group_title)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, null);
-            
-            setGroupEntries(builder);
-            
-            builder.show();
-            return true;
+        switch (item.getItemId()) {
+            case MENU_DISPLAY_GROUP:
+                AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                    .setTitle(R.string.select_group_title)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, null);
+                
+                setGroupEntries(builder);
+                
+                builder.show();
+                return true;
+
+            case MENU_SEARCH:
+                startSearch(null, false, null, false);
+                return true;
         }
         return false;
     }
@@ -888,6 +909,11 @@
 
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
+        // Hide soft keyboard, if visible
+        InputMethodManager inputMethodManager = (InputMethodManager)
+                getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(mList.getWindowToken(), 0);
+
         if (mMode == MODE_INSERT_OR_EDIT_CONTACT) {
             Intent intent;
             if (position == 0) {
@@ -1018,7 +1044,7 @@
 
             case MODE_WITH_PHONES:
                 mQueryHandler.startQuery(QUERY_TOKEN, null, People.CONTENT_URI, CONTACTS_PROJECTION,
-                        People.PRIMARY_PHONE_ID + " IS NOT NULL", null, People.DEFAULT_SORT_ORDER);
+                        People.PRIMARY_PHONE_ID + " IS NOT NULL", null, SORT_ORDER);
                 break;
 
             case MODE_QUERY: {
@@ -1075,8 +1101,7 @@
                 } else {
                     uri = Uri.withAppendedPath(mGroupFilterUri, Uri.encode(filter));
                 }
-                return resolver.query(uri, CONTACTS_PROJECTION, null, null,
-                        People.DEFAULT_SORT_ORDER);
+                return resolver.query(uri, CONTACTS_PROJECTION, null, null, SORT_ORDER);
             }
 
             case MODE_ALL_CONTACTS:
@@ -1294,7 +1319,7 @@
         private CharSequence[] mLocalizedLabels;
 
         public ContactItemListAdapter(Context context) {
-            super(context, R.layout.contacts_list_item, null);
+            super(context, R.layout.contacts_list_item, null, false);
             
             mAlphabet = context.getString(com.android.internal.R.string.fast_scroll_alphabet);
             
@@ -1311,6 +1336,24 @@
             }
         }
 
+        /**
+         * Callback on the UI thread when the content observer on the backing cursor fires.
+         * Instead of calling requery we need to do an async query so that the requery doesn't
+         * block the UI thread for a long time. 
+         */
+        @Override
+        protected void onContentChanged() {
+            CharSequence constraint = getListView().getTextFilter();
+            if (!TextUtils.isEmpty(constraint)) {
+                // Reset the filter state then start an async filter operation
+                Filter filter = getFilter();
+                filter.filter(constraint);
+            } else {
+                // Start an async query
+                startQuery();
+            }
+        }
+        
         public void setLoading(boolean loading) {
             mLoading = loading;
         }
diff --git a/src/com/android/contacts/EditContactActivity.java b/src/com/android/contacts/EditContactActivity.java
index c12074e..49569e3 100644
--- a/src/com/android/contacts/EditContactActivity.java
+++ b/src/com/android/contacts/EditContactActivity.java
@@ -69,6 +69,7 @@
 import android.provider.Contacts;
 import android.provider.Contacts.ContactMethods;
 import android.provider.Contacts.Intents.Insert;
+import android.provider.Contacts.Groups;
 import android.provider.Contacts.Organizations;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
@@ -932,6 +933,44 @@
             if (!TextUtils.isEmpty(displayGroup)) {
                 People.addToGroup(mResolver, ContentUris.parseId(contactUri), displayGroup);
             }
+        } else {
+            // Check to see if we're not syncing everything and if so if My Contacts is synced.
+            // If it isn't then the created contact can end up not in any groups that are
+            // currently synced and end up getting removed from the phone, which is really bad.
+            boolean syncingEverything = !"0".equals(Contacts.Settings.getSetting(mResolver, null,
+                    Contacts.Settings.SYNC_EVERYTHING));
+            if (!syncingEverything) {
+                boolean syncingMyContacts = false;
+                Cursor c = mResolver.query(Groups.CONTENT_URI, new String[] { Groups.SHOULD_SYNC },
+                        Groups.SYSTEM_ID + "=?", new String[] { Groups.GROUP_MY_CONTACTS }, null);
+                if (c != null) {
+                    try {
+                        if (c.moveToFirst()) {
+                            syncingMyContacts = !"0".equals(c.getString(0));
+                        }
+                    } finally {
+                        c.close();
+                    }
+                }
+
+                if (!syncingMyContacts) {
+                    // Not syncing My Contacts, so find a group that is being synced and stick
+                    // the contact in there. We sort the list so at least all contacts
+                    // will appear in the same group.
+                    c = mResolver.query(Groups.CONTENT_URI, new String[] { Groups._ID },
+                            Groups.SHOULD_SYNC + "!=0", null, Groups.DEFAULT_SORT_ORDER);
+                    if (c != null) {
+                        try {
+                            if (c.moveToFirst()) {
+                                People.addToGroup(mResolver, ContentUris.parseId(contactUri),
+                                        c.getLong(0));
+                            }
+                        } finally {
+                            c.close();
+                        }
+                    }
+                }
+            }
         }
 
         // Handle the photo
diff --git a/src/com/android/contacts/RecentCallsListActivity.java b/src/com/android/contacts/RecentCallsListActivity.java
index 8d6360b..dbf2879 100644
--- a/src/com/android/contacts/RecentCallsListActivity.java
+++ b/src/com/android/contacts/RecentCallsListActivity.java
@@ -95,7 +95,7 @@
     /** The projection to use when querying the phones table */
     static final String[] PHONES_PROJECTION = new String[] {
             Phones.PERSON_ID,
-            Phones.NAME,
+            Phones.DISPLAY_NAME,
             Phones.TYPE,
             Phones.LABEL,
             Phones.NUMBER