diff --git a/res/layout-finger/list_separator.xml b/res/layout-finger/list_separator.xml
index 2ab4859..1257935 100644
--- a/res/layout-finger/list_separator.xml
+++ b/res/layout-finger/list_separator.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,5 +18,5 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/listSeparatorTextViewStyle"
     android:textColor="@*android:color/dim_foreground_dark"
-    android:gravity="center_horizontal"
+    android:gravity="left|center_vertical"
 />
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0cc1605..8372650 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,10 +16,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
-    <string name="launcherDialer" msgid="8636288196618486553">"Teléfono"</string>
+    <string name="launcherDialer" msgid="140610573639849799">"Marcador"</string>
     <string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
-    <string name="shortcutDialContact" msgid="746622101599186779">"Marcado directo"</string>
-    <string name="shortcutMessageContact" msgid="2460337253595976198">"Mensaje directo"</string>
+    <string name="shortcutDialContact" msgid="7165340343023469996">"Marcado directo"</string>
+    <string name="shortcutMessageContact" msgid="3025782962770298900">"Mensaje directo"</string>
     <string name="shortcutActivityTitle" msgid="6642877210643565436">"Seleccionar un acceso directo"</string>
     <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Seleccionar un número para la llamada"</string>
     <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Seleccionar un número para el mensaje"</string>
@@ -40,39 +40,25 @@
     <string name="menu_showBarcode" msgid="309973637178814132">"Mostrar código de barras"</string>
     <string name="menu_editContact" msgid="3452858480713561396">"Editar contacto"</string>
     <string name="menu_deleteContact" msgid="1916555454274101750">"Suprimir contacto"</string>
-    <string name="menu_call" msgid="3992595586042260618">"Llamar al contacto"</string>
-    <string name="menu_sendSMS" msgid="5535886767547006515">"Enviar texto al contacto"</string>
+    <!-- no translation found for menu_call (3992595586042260618) -->
+    <skip />
+    <!-- no translation found for menu_sendSMS (5535886767547006515) -->
+    <skip />
     <string name="menu_sendEmail" msgid="7293508859242926187">"Enviar correo electrónico"</string>
     <string name="menu_viewAddress" msgid="1814744325763202024">"Dirección del mapa"</string>
     <string name="menu_makeDefaultNumber" msgid="4838759253316649534">"Crear número predeterminado"</string>
     <string name="menu_makeDefaultEmail" msgid="2599044610375789994">"Crear correo electrónico predeterminado"</string>
-    <!-- no translation found for menu_splitAggregate (8368636463748691868) -->
-    <skip />
+    <string name="menu_splitAggregate" msgid="7402548456225901170">"Dividir"</string>
     <string name="splitAggregate_title" msgid="2053462872948058798">"Dividir contacto"</string>
-    <!-- no translation found for contactsSplitMessage (5253490235863170269) -->
-    <skip />
-    <!-- no translation found for splitConfirmation_title (6716467920283502570) -->
-    <skip />
-    <!-- no translation found for splitConfirmation (1150797297503944823) -->
-    <skip />
+    <string name="contactsSplitMessage" msgid="3439008547775199243">"División de contacto"</string>
     <string name="menu_joinAggregate" msgid="5027981918265667970">"Unirse"</string>
-    <string name="menu_showSources" msgid="885215611438295455">"Mostrar fuentes"</string>
-    <string name="menu_hideSources" msgid="71367585820555477">"Ocultar fuentes"</string>
     <string name="titleJoinAggregate" msgid="6970566008563147202">"Unirse al contacto"</string>
-    <string name="titleJoinContactDataWith" msgid="7684875775798635354">"Unirse a contactos"</string>
-    <string name="blurbJoinContactDataWith" msgid="995870557595050304">"Selecciona el contacto al que quieras unirte con <xliff:g id="NAME">%s</xliff:g>."</string>
-    <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos los contactos"</string>
-    <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
+    <string name="separatorJoinAggregateSuggestions" msgid="5494823322479834017">"Sugerencias"</string>
     <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
     <string name="contactsJoinedMessage" msgid="7208148163607047389">"Unión de contactos"</string>
     <string name="menu_contactOptions" msgid="1957061455705020617">"Opciones"</string>
     <string name="contactOptionsTitle" msgid="8259347644090700915">"Opciones"</string>
     <string name="deleteConfirmation_title" msgid="6394309508930335204">"Suprimir"</string>
-    <!-- no translation found for readOnlyContactWarning (1390849295342594265) -->
-    <skip />
-    <!-- no translation found for readOnlyContactDeleteConfirmation (2137170726670196909) -->
-    <skip />
-    <string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Eliminar este contacto suprimirá la información de mútliples cuentas."</string>
     <string name="deleteConfirmation" msgid="811706994761610640">"Este contacto se suprimirá."</string>
     <string name="menu_done" msgid="796017761764190697">"Finalizado"</string>
     <string name="menu_doNotSave" msgid="2174577548513895144">"Revertir"</string>
@@ -111,8 +97,8 @@
     <string name="photoPickerNotFoundText" msgid="431331662154342581">"No hay imágenes disponibles en el teléfono."</string>
     <string name="attachToContact" msgid="8820530304406066714">"Ícono de contacto"</string>
     <string name="customLabelPickerTitle" msgid="1081475101983255212">"Nombre personalizado de etiqueta"</string>
-    <string name="menu_displayGroup" msgid="5655505437727616553">"Mostrar opciones"</string>
-    <string name="displayGroups" msgid="2278964020773993336">"Mostrar opciones"</string>
+    <string name="menu_displayGroup" msgid="6022511302986343108">"Mostrar grupos"</string>
+    <string name="displayGroups" msgid="2645969886032719891">"Mostrar grupos"</string>
     <string name="syncGroupPreference" msgid="9028361137161162861">"Editar grupos sincroniz."</string>
     <string name="importFromSim" msgid="8383900146531125319">"Importar contactos"</string>
     <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar llamadas directamente al correo de voz"</string>
@@ -121,7 +107,6 @@
     <string name="addPicture" msgid="1594679312161537678">"Agregar ícono"</string>
     <string name="removePicture" msgid="3041230993155966350">"Eliminar ícono"</string>
     <string name="noContacts" msgid="8579310973261953559">"No hay contactos."</string>
-    <string name="noMatchingContacts" msgid="4266283206853990471">"No se encontraron contactos coincidentes."</string>
     <string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"No hay contactos con números de teléfono."</string>
     <string name="noFavorites" msgid="812766386743315815">"No hay favoritos."</string>
     <string name="select_group_title" msgid="7955698611959835612">"Grupos"</string>
@@ -129,7 +114,7 @@
     <string name="showAllGroups" msgid="5164410117611094297">"Todos los contactos"</string>
     <string name="showFilterPhones" msgid="4184858075465653970">"Sólo contactos con teléfonos"</string>
     <string name="showFilterPhonesDescrip" msgid="6644443248815191067">"Mostrar sólo contactos que posean números de teléfono"</string>
-    <string name="headerContactGroups" msgid="2426134991932503843">"Elige contactos para mostrar"</string>
+    <string name="headerContactGroups" msgid="1451383377487746789">"Grupos de contactos"</string>
   <plurals name="groupDescrip">
     <item quantity="other" msgid="3507881585720628389">"<xliff:g id="COUNT">%0$d</xliff:g> contactos"</item>
   </plurals>
@@ -137,17 +122,16 @@
     <item quantity="other" msgid="3816047547470490208">"<xliff:g id="COUNT_0">%1$d</xliff:g> contactos, <xliff:g id="COUNTWITHPHONES">%2$d</xliff:g> con teléfonos"</item>
   </plurals>
     <string name="syncAllGroups" msgid="7512169081224806890">"Sincronizar todos los contactos"</string>
-    <string name="groupNameMyContacts" msgid="277995505294105439">"Mis contactos"</string>
+    <string name="groupNameMyContacts" msgid="5696566165170977126">"Mis contactos"</string>
     <string name="groupNameWithPhones" msgid="6981588604041120497">"Contactos con números de teléfono"</string>
     <string name="starredInAndroid" msgid="6495527538140213440">"Marcado con asterisco en Android"</string>
-    <string name="savingContact" msgid="4075751076741924939">"Guardando contacto..."</string>
-    <string name="savingDisplayGroups" msgid="2133152192716475939">"Guardando opciones de visualización..."</string>
     <string name="contactCreatedToast" msgid="8740102129968688060">"Contacto creado."</string>
     <string name="contactSavedToast" msgid="7152589189385441091">"Contacto guardado."</string>
-    <string name="contactSavedErrorToast" msgid="9189098776225004666">"Error, no se han podido guardar las modificaciones de contacto."</string>
+    <!-- no translation found for contactSavedErrorToast (9189098776225004666) -->
+    <skip />
     <string name="listSeparatorCallNumber" msgid="7115321894439629408">"Marcar número"</string>
     <string name="listSeparatorCallNumber_edit" msgid="2999167270900823334">"Números de teléfono"</string>
-    <string name="listSeparatorSendSmsMms" msgid="5351657038532024412">"Enviar texto"</string>
+    <string name="listSeparatorSendSmsMms" msgid="2480944736714739967">"Enviar SMS//MMS"</string>
     <string name="listSeparatorSendEmail" msgid="5395590830304525721">"Enviar correo electrónico"</string>
     <string name="listSeparatorSendEmail_edit" msgid="6859593624213634454">"Direcciones de correo electr."</string>
     <string name="listSeparatorSendIm" msgid="2209260633185984105">"Enviar mensaje instantáneo"</string>
@@ -159,27 +143,15 @@
     <string name="listSeparatorOtherInformation" msgid="7844959649638482329">"Otra información"</string>
     <string name="listSeparatorOtherInformation_edit" msgid="1326921768011367750">"Otras opciones"</string>
     <string name="listSeparatorMore_edit" msgid="858454837482243176">"Más"</string>
-    <!-- no translation found for listTotalPhoneContacts:one (8721111084815668845) -->
-    <!-- no translation found for listTotalPhoneContacts:other (6133262880804110289) -->
-    <!-- no translation found for listTotalPhoneContactsZero (2756295259674938869) -->
-    <skip />
-    <!-- no translation found for listTotalAllContacts:one (1096068709488455155) -->
-    <!-- no translation found for listTotalAllContacts:other (2865867557378939630) -->
-    <!-- no translation found for listTotalAllContactsZero (6811347506748072822) -->
-    <skip />
-    <!-- no translation found for listFoundAllContacts:one (2830107332033967280) -->
-    <!-- no translation found for listFoundAllContacts:other (7752927996850263152) -->
-    <!-- no translation found for listFoundAllContactsZero (5554368784319460828) -->
-    <skip />
     <string name="socialStreamIconLabel" msgid="4367712449555075376">"Social"</string>
     <string name="contactsIconLabel" msgid="7666609097606552806">"Contactos"</string>
     <string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
-    <string name="dialerIconLabel" msgid="6500826552823403796">"Teléfono"</string>
+    <string name="dialerIconLabel" msgid="7228520966699542850">"Marcador"</string>
     <string name="recentCallsIconLabel" msgid="1419116422359067949">"Regist. de llam."</string>
     <string name="liveFolderAll" msgid="4789010460767506206">"Todos los contactos"</string>
     <string name="liveFolderFavorites" msgid="3100957542927222282">"Contactos marcados con asterisco"</string>
     <string name="liveFolderPhone" msgid="3739376066610926780">"Contactos con números de teléfono"</string>
-    <string name="menu_sendTextMessage" msgid="6937343460284499306">"Enviar mensaje de texto"</string>
+    <string name="menu_sendTextMessage" msgid="455561537582270625">"Enviar mensaje SMS"</string>
     <string name="recentCalls_callNumber" msgid="1756372533999226126">"Llamar a <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Editar número antes de llamar"</string>
     <string name="recentCalls_addToContact" msgid="1429899535546487008">"Agregar a contactos"</string>
@@ -197,13 +169,17 @@
     <string name="simContacts_emptyLoading" msgid="6700035985448642408">"Cargando desde tarjeta SIM..."</string>
     <string name="simContacts_title" msgid="27341688347689769">"Contactos de tarjeta SIM"</string>
     <string name="contactsSyncPlug" msgid="7248276704957313698"><font fgcolor="#ffffffff">"¡Sincroniza tus contactos de Google!"</font>" "\n" Luego de sincronizar tu teléfono, tus contactos estarán disponibles para ti dondequiera que vayas."</string>
-    <string name="noContactsHelpText" msgid="6788487368878712350">"No tienes ningún contacto para mostrar."\n\n"Para agregar contactos, presiona "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y toca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedes sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear tú mismo un contacto nuevo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>\n</li></string>
-    <string name="noContactsHelpTextWithSync" msgid="3734101165712848179">"No tienes ningún contacto para mostrar. (Si has agregado una cuenta, la sincronización de contactos puede demorar pocos minutos)."\n\n"Para agregar contactos, presiona "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y toca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar y configurar una cuenta con contactos que puedes sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear tú mismo un contacto nuevo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>\n</li></string>
-    <string name="noContactsNoSimHelpText" msgid="6553845386917463292">"No tienes ningún contacto para mostrar."\n\n"Para agregar contactos, presiona "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y toca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedes sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear tú mismo un contacto nuevo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>\n</li></string>
-    <string name="noContactsNoSimHelpTextWithSync" msgid="1122296298361373488">"No tienes ningún contacto para mostrar. (Si has agregado una cuenta, la sincronización de contactos puede demorar pocos minutos)."\n\n"Para agregar contactos, presiona "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y toca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar y configurar una cuenta con contactos que puedes sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear tú mismo un contacto nuevo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>\n</li></string>
-    <string name="noFavoritesHelpText" msgid="3744655776704833277">"No tienes ningún favorito."\n\n"Para agregar un contacto a tu lista de favoritos:"\n\n"        "<li>"toca la pestaña "<b>"Contactos"</b>" "\n</li>" "\n<li>"toca el contacto que deseas agregar a tus favoritos"\n</li>" "\n<li>"toca el asterisco situado junto al nombre del contacto"\n</li></string>
+    <string name="noContactsHelpText" msgid="2249195687463896364">"No tienes ningún contacto."\n\n"Para agregar contactos, presiona "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y selecciona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Nuevo contacto"</b></font>" para crear un contacto nuevo desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para agregar contactos desde tu tarjeta SIM"\n</li></string>
+    <!-- no translation found for noContactsHelpTextWithSync (2179024855526352215) -->
+    <skip />
+    <!-- no translation found for noContactsNoSimHelpText (645951808197910024) -->
+    <skip />
+    <!-- no translation found for noContactsNoSimHelpTextWithSync (511505839941079550) -->
+    <skip />
+    <!-- no translation found for noFavoritesHelpText (1705381563293866510) -->
+    <skip />
     <string name="seclectSyncGroups_title" msgid="1235432026231325655">"Seleccionar grupos para sincronizar"</string>
-    <string name="liveFolder_all_label" msgid="5961411940473276616">"Todos los contactos"</string>
+    <string name="liveFolder_all_label" msgid="1552523730090319259">"Todos los contactos"</string>
     <string name="liveFolder_favorites_label" msgid="2674341514070517105">"Marcado con asterisco"</string>
     <string name="liveFolder_phones_label" msgid="1709786878793436245">"Teléfonos"</string>
     <string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Usar teclado de tonos del teléfono"</string>
@@ -234,7 +210,7 @@
     <string name="returnCall" msgid="8171961914203617813">"Regresar llamada"</string>
     <string name="callDetailsDurationFormat" msgid="8157706382818184268">"<xliff:g id="MINUTES">%s</xliff:g> mins <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="favoritesFrquentSeparator" msgid="5007070838253932139">"Llamado con frecuencia"</string>
-    <string name="add_contact_dlg_title" msgid="2896685845822146494">"Agregar contacto"</string>
+    <string name="add_contact_dlg_title" msgid="2789046541229846116">"Agregar contacto"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"¿Deseas agregar \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos?"</string>
     <string name="all_tab_label" msgid="4003124364397916826">"Todos"</string>
     <string name="description_image_button_one" msgid="1740638037139856139">"uno"</string>
@@ -249,116 +225,108 @@
     <string name="description_image_button_star" msgid="3365919907520767866">"asterisco"</string>
     <string name="description_image_button_zero" msgid="4133108949401820710">"cero"</string>
     <string name="description_image_button_pound" msgid="3039765597595889230">"libra"</string>
-    <string name="no_sdcard_title" msgid="5911758680339949273">"No hay tarjeta SD"</string>
-    <string name="no_sdcard_message" msgid="6019391476490445358">"No se ha detectado ninguna tarjeta SD"</string>
-    <string name="searching_vcard_title" msgid="4970508055399376813">"Buscando vCard"</string>
+    <string name="no_sdcard_title" msgid="6455416795090113715">"No hay tarjeta SD"</string>
+    <string name="no_sdcard_message" msgid="7791906118138538259">"No se ha detectado ninguna tarjeta SD"</string>
+    <string name="searching_vcard_title" msgid="4158580043290687793">"Buscando VCard"</string>
     <string name="select_import_type_title" msgid="2443742794103731022">"¿De dónde quieres importar contactos?"</string>
-    <string name="import_from_sim" msgid="3859272228033941659">"Importar de la tarjeta SIM"</string>
-    <string name="import_from_sdcard" msgid="8550360976693202816">"Importar de la tarjeta SD"</string>
-    <string name="export_to_sdcard" msgid="2597105442616166277">"Exportar a la tarjeta SD"</string>
+    <!-- no translation found for import_from_sim (3859272228033941659) -->
+    <skip />
+    <!-- no translation found for import_from_sdcard (8550360976693202816) -->
+    <skip />
+    <!-- no translation found for export_to_sdcard (2597105442616166277) -->
+    <skip />
     <string name="import_one_vcard_string" msgid="9059163467020328433">"Importar un archivo de vCard"</string>
     <string name="import_multiple_vcard_string" msgid="3810226492811062392">"Importar múltiples archivos de vCard"</string>
     <string name="import_all_vcard_string" msgid="5518136113853448474">"Importar todos los archivos de vCard"</string>
-    <string name="searching_vcard_message" msgid="6917522333561434546">"Buscando datos de vCard en la tarjeta SD"</string>
-    <string name="scanning_sdcard_failed_title" msgid="3506782007953167180">"No se ha podido explorar la tarjeta SD"</string>
-    <string name="scanning_sdcard_failed_message" msgid="3761992500690182922">"No se ha podido explorar la tarjeta SD. (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
-    <string name="fail_reason_io_error" msgid="5922864781066136340">"Error de E/S"</string>
-    <string name="fail_reason_vcard_parse_error" msgid="1201233722762680214">"No se ha podido analizar vCard debido a un motivo inesperado"</string>
-    <string name="fail_reason_vcard_not_supported_error" msgid="655208100451286027">"No se ha podido analizar vCard aunque el formato parece válido, ya que la implementación actual no lo admite"</string>
-    <string name="fail_reason_no_vcard_file" msgid="6376516175882881595">"No se ha encontrado un archivo de vCard en la Tarjeta SD."</string>
-    <string name="fail_reason_no_vcard_entry" msgid="4733290752474073143">"No se ha encontrado ninguna entrada válida de vCard para tu selección"</string>
+    <string name="searching_vcard_message" msgid="2467573749792455605">"Buscando datos VCard en VCard"</string>
+    <string name="scanning_sdcard_failed_title" msgid="2788276113399585924">"No se ha podido explorar la Tarjeta SD"</string>
+    <string name="scanning_sdcard_failed_message" msgid="925361244069058117">"No se ha podido explorar la Tarjeta SD"</string>
+    <string name="fail_reason_io_error" msgid="5949038573678667996">"Error de E/S (Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
+    <string name="fail_reason_vcard_parse_error" msgid="8877496734269540489">"No se ha podido analizar VCard por algún motivo inesperado"</string>
+    <string name="fail_reason_vcard_not_supported_error" msgid="166568606246563552">"No se ha podido analizar VCard aunque el formato parece válido, ya que la implementación actual no lo admite"</string>
+    <string name="fail_reason_no_vcard_file" msgid="1489638537002538332">"No se ha encontrado un archivo de VCard en la Tarjeta SD"</string>
+    <string name="fail_reason_no_vcard_entry" msgid="3808734131680935043">"No se ha encontrado ninguna entrada válida de VCard para tu selección"</string>
     <string name="fail_reason_failed_to_read_files" msgid="3659521123567134029">"No se pudieron importar uno o más archivos (%s)."</string>
-    <string name="fail_reason_unknown" msgid="999034019513096768">"Error desconocido"</string>
-    <string name="select_vcard_title" msgid="3968948173786172468">"Seleccionar archivo de vCard"</string>
-    <string name="select_vcard_message" msgid="221189184212818304">"Selecciona un archivo de vCard para importar"</string>
+    <string name="select_vcard_title" msgid="4615933643517710543">"Seleccionar archivo de VCard"</string>
+    <string name="select_vcard_message" msgid="7028772212789057858">"Seleccionar un archivo de VCard para importar"</string>
     <string name="progress_shower_message" msgid="5636525578293752526">"Segmento <xliff:g id="ACTION">%s</xliff:g>"\n"<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_title" msgid="4723433501579653199">"Leyendo vCard"</string>
-    <string name="reading_vcard_message" msgid="6381368920030748743">"Leyendo archivo(s) de vCard"</string>
-    <string name="importing_vcard_message" msgid="4046655384673753503">"Importando datos de vCard"</string>
-    <string name="reading_vcard_failed_title" msgid="4923008144735294994">"No se han podido leer los datos de vCard"</string>
-    <string name="reading_vcard_failed_message" msgid="5684089173948287107">"No se ha podido leer vCard."\n"Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+    <string name="reading_vcard_title" msgid="430154704397375160">"Leyendo VCard"</string>
+    <string name="reading_vcard_message" msgid="7470486051482460267">"Leyendo archivo(s) de VCard"</string>
+    <string name="importing_vcard_message" msgid="2466665710812588738">"Importando datos VCard"</string>
+    <string name="reading_vcard_failed_title" msgid="5042366466147724748">"No se han podido leer los datos VCard"</string>
+    <string name="reading_vcard_failed_message" msgid="780588344175743735">"No se han podido leer los datos VCard"\n"Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
     <string name="reading_vcard_contacts" msgid="3066834102042012868">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
     <string name="reading_vcard_files" msgid="34180143726972661">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> archivos"</string>
-    <string name="export_all_contacts" msgid="2873892623335194071">"Todos los contactos"</string>
-    <string name="export_phone_local_only" msgid="3380497955409896761">"Contactos guardados localmente"</string>
     <string name="export_contact_list" msgid="3165097742175874384">"Exportar contactos"</string>
-    <string name="confirm_export_title" msgid="7648747763127442983">"Confirmar exportación"</string>
-    <string name="confirm_export_message" msgid="3875683519257829750">"¿Estás seguro de que deseas exportar tu lista de contactos a \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
-    <string name="exporting_contact_failed_title" msgid="585823094820602526">"No se han podido exportar los datos de contacto"</string>
-    <string name="exporting_contact_failed_message" msgid="4151348002470298092">"No se han podido exportar los datos de contacto."\n"Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="fail_reason_no_exportable_contact" msgid="4919714086648344495">"No hay ningún contacto exportable"</string>
-    <string name="fail_reason_too_many_vcard" msgid="7084146295639672658">"Demasiados archivos de vCard en la tarjeta SD"</string>
-    <string name="fail_reason_too_long_filename" msgid="1915716071321839166">"El nombre de archivo requerido es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
+    <string name="confirm_export_title" msgid="1693047909433122854">"Confirmación para exportar"</string>
+    <string name="confirm_export_message" msgid="63482084706768079">"¿Aceptas exportar tu lista de contactos a \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
+    <string name="exporting_contact_failed_title" msgid="1455264422455075858">"Ha ocurrido un error al exportar datos de contacto"</string>
+    <string name="exporting_contact_failed_message" msgid="1426451081541603512">"Ha ocurrido un error al exportar los datos de contacto"\n"Motivo del error: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+    <string name="fail_reason_too_many_vcard" msgid="5416992255233341607">"Demasiados datos de VCard en la tarjeta SD"</string>
+    <string name="fail_reason_too_long_filename" msgid="7105223965196949065">"Nombre de archivo demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\") es necesario"</string>
     <string name="fail_reason_cannot_open_destination_dir" msgid="1739293936432987758">"No se ha podido abrir o crear el directorio de destino \"<xliff:g id="DIR_NAME">%s</xliff:g>\""</string>
     <string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
     <string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando datos de contacto a \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4943708332700987376">"No se ha podido inicializar el exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
     <string name="fail_reason_error_occurred_during_export" msgid="2151165129433831202">"Se produjo un error durante la exportación: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="3723109558155169053">"No se ha podido obtener información de la base de datos"</string>
-    <string name="composer_has_no_exportable_contact" msgid="2239503301380653777">"No hay ningún contacto exportable. Puedes elegir datos no exportables"</string>
-    <string name="composer_not_initialized" msgid="8041534450748388843">"El redactor de vCard no se ha inicializado correctamente"</string>
     <string name="fail_reason_could_not_open_file" msgid="4013520943128739511">"No se pudo abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
     <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
     <string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
-    <string name="add_2sec_pause" msgid="9214012315201040129">"Agregar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="3360818652790319634">"Agregar espera"</string>
+    <string name="add_2sec_pause" msgid="1488865103809190124">"Agregar pausa de dos segundos"</string>
+    <string name="add_wait" msgid="8347184715316058465">"Agregar espera"</string>
     <string name="dial_button_label" msgid="7637725632722605863">"Marcar"</string>
-    <string name="call_disambig_title" msgid="1911302597959335178">"Llamar con"</string>
-    <string name="sms_disambig_title" msgid="4675399294513152364">"Texto con"</string>
-    <string name="make_primary" msgid="5829291915305113983">"Recuerda esta opción"</string>
-    <string name="quickcontact_missing_app" msgid="4600366393134289038">"No se encontró una aplicación para manejar esta acción."</string>
-    <string name="quickcontact_remember_choice" msgid="5964536411579749424">"Recuerda esta opción."</string>
-    <string name="quickcontact_missing_name" msgid="5590266114306996632">"Desconocido"</string>
+    <!-- no translation found for call_disambig_title (1911302597959335178) -->
+    <skip />
+    <!-- no translation found for sms_disambig_title (4675399294513152364) -->
+    <skip />
+    <!-- no translation found for make_primary (5829291915305113983) -->
+    <skip />
+    <string name="quickcontact_missing_app" msgid="1181287640680679441">"No se encontró aplicación para permitir esta acción"</string>
+    <string name="quickcontact_remember_choice" msgid="2858356075887897116">"Recuerda esta opción"</string>
+    <string name="quickcontact_missing_name" msgid="7806083820928955853">"Desconocido"</string>
     <string name="menu_accounts" msgid="8499114602017077970">"Cuentas"</string>
-    <string name="menu_import_export" msgid="3765725645491577190">"Importar/Exportar"</string>
-    <string name="dialog_import_export" msgid="4771877268244096596">"Importar/Exportar contactos"</string>
-    <string name="menu_share" msgid="943789700636542260">"Compartir"</string>
-    <string name="share_via" msgid="563121028023030093">"Compartir un contacto a través de"</string>
-    <string name="share_error" msgid="4374508848981697170">"Este contacto no se puede compartir."</string>
+    <!-- no translation found for menu_import_export (3765725645491577190) -->
+    <skip />
+    <!-- no translation found for dialog_import_export (4771877268244096596) -->
+    <skip />
+    <!-- no translation found for menu_share (943789700636542260) -->
+    <skip />
+    <!-- no translation found for share_via (563121028023030093) -->
+    <skip />
+    <!-- no translation found for share_error (4374508848981697170) -->
+    <skip />
     <string name="nameLabelsGroup" msgid="2034640839640477827">"Nombre"</string>
     <string name="nicknameLabelsGroup" msgid="2891682101053358010">"Apodo"</string>
     <string name="organizationLabelsGroup" msgid="2478611760751832035">"Organización"</string>
     <string name="websiteLabelsGroup" msgid="4202998982804009261">"Sitio web"</string>
-    <string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
     <string name="type_short_home" msgid="7770424864090605384">"H"</string>
     <string name="type_short_mobile" msgid="1655473281466676216">"Lun."</string>
     <string name="type_short_work" msgid="4925330752504537861">"Mié."</string>
     <string name="type_short_pager" msgid="2613818970827594238">"P"</string>
     <string name="type_short_other" msgid="5669407180177236769">"Oct."</string>
-    <string name="edit_read_only" msgid="8158629550655830981">"Este contacto es de sólo lectura"</string>
-    <string name="edit_secondary_collapse" msgid="5371618426594477103">"Más"</string>
+    <string name="edit_secondary_collapse" msgid="1855127176548440583">"Detalles secundarios"</string>
     <string name="dialog_primary_name" msgid="5521591005692614833">"Nombre principal"</string>
     <string name="dialog_new_contact_account" msgid="9044704073286262197">"Crear contacto según la cuenta"</string>
     <string name="menu_sync_remove" msgid="3266725887008450161">"Eliminar grupo de sincronización"</string>
-    <string name="dialog_sync_add" msgid="8267045393119375803">"Agregar grupo de sincronización"</string>
-    <string name="display_more_groups" msgid="2682547080423434170">"Más grupos…"</string>
-    <string name="display_ungrouped" msgid="4602580795576261158">"Todos los otros contactos"</string>
-    <string name="display_all_contacts" msgid="6846131371214707956">"Todos los contactos"</string>
+    <!-- no translation found for dialog_sync_add (8267045393119375803) -->
+    <skip />
+    <!-- no translation found for display_more_groups (2682547080423434170) -->
+    <skip />
+    <string name="display_ungrouped" msgid="4357317661311803984">"(Contactos no agrupados)"</string>
     <string name="display_warn_remove_ungrouped" msgid="2314043155909167610">"Al suprimir \"<xliff:g id="GROUP">%s</xliff:g>\" de sincronización también se suprimirá cualquier contacto no agrupado de la sincronización."</string>
     <string name="account_phone" msgid="4025734638492419713">"Sólo telefónicamente (no sincronizado)"</string>
     <string name="label_email_display_name" msgid="5537802602754309600">"Mostrar el nombre"</string>
-    <string name="call_custom" msgid="7756571794763171802">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_home" msgid="1990519474420545392">"Llamar al hogar"</string>
     <string name="call_mobile" msgid="7502236805487609178">"Llamar al celular"</string>
     <string name="call_work" msgid="5328785911463744028">"Llamar al trabajo"</string>
     <string name="call_fax_work" msgid="7467763592359059243">"Llamar al fax del trabajo"</string>
     <string name="call_fax_home" msgid="8342175628887571876">"Llamar al fax personal"</string>
     <string name="call_pager" msgid="9003902812293983281">"Llamar a localizador"</string>
-    <string name="call_other" msgid="5605584621798108205">"Llamar a otro"</string>
-    <string name="call_callback" msgid="1910165691349426858">"Llamar a devolución de llamada"</string>
+    <string name="call_custom" msgid="7756571794763171802">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="call_car" msgid="3280537320306436445">"Llamar al auto"</string>
     <string name="call_company_main" msgid="6105120947138711257">"Llamar empresa principal"</string>
-    <string name="call_isdn" msgid="1541590690193403411">"Llamar a ISDN"</string>
-    <string name="call_main" msgid="6082900571803441339">"Llamada principal"</string>
-    <string name="call_other_fax" msgid="7777261153532968503">"Llamar a otro fax"</string>
-    <string name="call_radio" msgid="8296755876398357063">"Llamar a la radio"</string>
-    <string name="call_telex" msgid="2223170774548648114">"Llamar a télex"</string>
-    <string name="call_tty_tdd" msgid="8951266948204379604">"Llamar a TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="8707874281430105394">"Llamar al celular del trabajo"</string>
-    <string name="call_work_pager" msgid="3419348514157949008">"Llamar al localizador del trabajo"</string>
-    <string name="call_assistant" msgid="2141641383068514308">"Llamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="6274041545876221437">"Llamar a MMS"</string>
-    <string name="sms_custom" msgid="5932736853732191825">"Texto <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="call_radio" msgid="8296755876398357063">"Llamar a la radio"</string>
     <string name="sms_home" msgid="7524332261493162995">"Enviar texto al hogar"</string>
     <string name="sms_mobile" msgid="5200107250451030769">"Enviar texto a celular"</string>
     <string name="sms_work" msgid="2269624156655267740">"Enviar texto al trabajo"</string>
@@ -366,19 +334,11 @@
     <string name="sms_fax_home" msgid="9204042076306809634">"Enviar texto a fax personal"</string>
     <string name="sms_pager" msgid="7730404569637015192">"Enviar texto a localizador"</string>
     <string name="sms_other" msgid="5131921487474531617">"Enviar texto a otro"</string>
-    <string name="sms_callback" msgid="5004824430094288752">"Enviar texto a devolución de llamada"</string>
+    <string name="sms_custom" msgid="5932736853732191825">"Texto <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_car" msgid="7444227058437359641">"Enviar texto a auto"</string>
     <string name="sms_company_main" msgid="118970873419678087">"Enviar texto a empresa principal"</string>
-    <string name="sms_isdn" msgid="8153785037515047845">"ISDN de texto"</string>
-    <string name="sms_main" msgid="8621625784504541679">"Texto principal"</string>
-    <string name="sms_other_fax" msgid="3930666870074006114">"Enviar texto a otro fax"</string>
-    <string name="sms_radio" msgid="3329166673433967820">"Enviar texto a radio"</string>
-    <string name="sms_telex" msgid="9034802430065267848">"Enviar texto a télex"</string>
-    <string name="sms_tty_tdd" msgid="6782284969132531532">"Enviar texto a TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2459939960512702560">"Enviar texto al celular del trabajo"</string>
-    <string name="sms_work_pager" msgid="5566924423316960597">"Enviar texto a localizador del trabajo"</string>
-    <string name="sms_assistant" msgid="2773424339923116234">"Enviar texto a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4069352461380762677">"Enviar texto MMS"</string>
+    <string name="sms_radio" msgid="3329166673433967820">"Enviar texto a radio"</string>
     <string name="email_home" msgid="8573740658148184279">"Correo electrónico personal"</string>
     <string name="email_mobile" msgid="2042889209787989814">"Correo electrónico celular"</string>
     <string name="email_work" msgid="2807430017302722689">"Correo electrónico laboral"</string>
@@ -397,7 +357,6 @@
     <string name="chat_gtalk" msgid="981575737258117697">"Chat mediante Google Talk"</string>
     <string name="chat_icq" msgid="8438405386153745775">"Chat mediante ICQ"</string>
     <string name="chat_jabber" msgid="7561444230307829609">"Chat mediante Jabber"</string>
-    <string name="chat" msgid="9025361898797412245">"Chat"</string>
     <string name="postal_street" msgid="8133143961580058972">"Dirección postal"</string>
     <string name="postal_pobox" msgid="4431938829180269821">"Apartado postal"</string>
     <string name="postal_neighborhood" msgid="1450783874558956739">"Barrio"</string>
@@ -413,7 +372,4 @@
     <string name="name_phonetic_given" msgid="6853570431394449191">"Nombre de pila fonético"</string>
     <string name="name_phonetic_middle" msgid="8643721493320405200">"Segundo nombre fonético"</string>
     <string name="name_phonetic_family" msgid="462095502140180305">"Nombre familiar fonético"</string>
-    <string name="split_label" msgid="8262112659919449087">"Dividir"</string>
-    <string name="split_explanation" msgid="1824739956426973592">"Transformar a estos datos en el contacto propio."</string>
-    <string name="account_name_format" msgid="4421123930035299208">"De <xliff:g id="SOURCE">%1$s</xliff:g> la cuenta: <xliff:g id="ACCOUNT">%2$s</xliff:g>"</string>
 </resources>
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index c4e37af..efa92ca 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -2466,8 +2466,10 @@
                 cache.nameView.setText(mUnknownNameText);
             }
 
+            boolean hasPhone = cursor.getInt(SUMMARY_HAS_PHONE_COLUMN_INDEX) != 0;
+
             // Make the call button visible if requested.
-            if (mDisplayCallButton) {
+            if (mDisplayCallButton && hasPhone) {
                 int pos = cursor.getPosition();
                 cache.callView.setVisibility(View.VISIBLE);
                 cache.callButton.setTag(pos);
diff --git a/src/com/android/contacts/ExportVCardActivity.java b/src/com/android/contacts/ExportVCardActivity.java
index baf2371..dd1ecc3 100644
--- a/src/com/android/contacts/ExportVCardActivity.java
+++ b/src/com/android/contacts/ExportVCardActivity.java
@@ -36,6 +36,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * Class for exporting vCard.
+ *
+ * Note that this Activity assumes that the instance is a "one-shot Activity", which will be
+ * finished (with the method {@link Activity#finish()}) after the export and never reuse
+ * any Dialog in the instance. So this code is careless about the management around managed
+ * dialogs stuffs (like how onCreateDialog() is used).
+ */
 public class ExportVCardActivity extends Activity {
     private static final String LOG_TAG = "ExportVCardActivity";
 
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index 8fd9c0d..eb99c95 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -90,6 +90,11 @@
 /**
  * Class for importing vCard. Several user interaction will be required while reading
  * (selecting a file, waiting a moment, etc.)
+ *
+ * Note that this Activity assumes that the instance is a "one-shot Activity", which will be
+ * finished (with the method {@link Activity#finish()}) after the import and never reuse
+ * any Dialog in the instance. So this code is careless about the management around managed
+ * dialogs stuffs (like how onCreateDialog() is used).
  */
 public class ImportVCardActivity extends Activity {
     private static final String LOG_TAG = "ImportVCardActivity";
@@ -334,6 +339,10 @@
                         is.close();
                     } catch (IOException e) {
                     }
+                    if (builder instanceof VCardDataBuilder) {
+                        // Let the object clean up internal temporal objects,
+                        ((VCardDataBuilder)builder).clear();
+                    }
                     is = new FileInputStream(canonicalPath);
 
                     try {
@@ -673,20 +682,6 @@
         return builder.create();
     }
 
-    private Dialog getReadingVCardDialog() {
-        if (mProgressDialogForReadVCard == null) {
-            String title = getString(R.string.reading_vcard_title);
-            String message = getString(R.string.reading_vcard_message);
-            mProgressDialogForReadVCard = new ProgressDialog(this);
-            mProgressDialogForReadVCard.setTitle(title);
-            mProgressDialogForReadVCard.setMessage(message);
-            mProgressDialogForReadVCard.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-            mProgressDialogForReadVCard.setOnCancelListener(mVCardReadThread);
-            mVCardReadThread.start();
-        }
-        return mProgressDialogForReadVCard;
-    }
-
     @Override
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
@@ -748,7 +743,17 @@
                 return getVCardFileSelectDialog(false);
             }
             case R.id.dialog_reading_vcard: {
-                return getReadingVCardDialog();
+                if (mProgressDialogForReadVCard == null) {
+                    String title = getString(R.string.reading_vcard_title);
+                    String message = getString(R.string.reading_vcard_message);
+                    mProgressDialogForReadVCard = new ProgressDialog(this);
+                    mProgressDialogForReadVCard.setTitle(title);
+                    mProgressDialogForReadVCard.setMessage(message);
+                    mProgressDialogForReadVCard.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+                    mProgressDialogForReadVCard.setOnCancelListener(mVCardReadThread);
+                    mVCardReadThread.start();
+                }
+                return mProgressDialogForReadVCard;
             }
             case R.id.dialog_io_exception: {
                 String message = (getString(R.string.scanning_sdcard_failed_message,
diff --git a/tests/src/com/android/contacts/RecentCallsListActivityTests.java b/tests/src/com/android/contacts/RecentCallsListActivityTests.java
index 2cdd8d7..afa1a7a 100644
--- a/tests/src/com/android/contacts/RecentCallsListActivityTests.java
+++ b/tests/src/com/android/contacts/RecentCallsListActivityTests.java
@@ -276,7 +276,7 @@
             duration = mRnd.nextInt(10 * 60);  // 0 - 10 minutes random.
         }
         row.add(duration);  // duration
-        if (mVoicemail.equals(number)) {
+        if (mVoicemail != null && mVoicemail.equals(number)) {
             assertEquals(Calls.OUTGOING_TYPE, type);
         }
         row.add(type);  // type
@@ -309,7 +309,10 @@
      * @param duration In seconds of the call. Use RAND_DURATION to pick a random one.
      */
     private void insertVoicemail(long date, int duration) {
-        insert(mVoicemail, date, duration, Calls.OUTGOING_TYPE);
+        // mVoicemail may be null
+        if (mVoicemail != null) {
+            insert(mVoicemail, date, duration, Calls.OUTGOING_TYPE);
+        }
     }
 
     /**