diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2a4bf80..3af8e1f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -109,7 +109,7 @@
         <!-- An empty activity that presents the DialtactActivity's Contacts tab -->
         <activity-alias android:name="DialtactsContactsEntryActivity"
             android:targetActivity="DialtactsActivity"
-            android:label="@string/contactsIconLabel"
+            android:label="@string/contactsList"
             android:icon="@drawable/ic_launcher_contacts"
         >
             <intent-filter>
diff --git a/res/drawable-finger/border_default.9.png b/res/drawable-finger/border_default.9.png
index e65051d..b75495a 100644
--- a/res/drawable-finger/border_default.9.png
+++ b/res/drawable-finger/border_default.9.png
Binary files differ
diff --git a/res/drawable-finger/border_pressed.9.png b/res/drawable-finger/border_pressed.9.png
index 74bc281..95c41cb 100644
--- a/res/drawable-finger/border_pressed.9.png
+++ b/res/drawable-finger/border_pressed.9.png
Binary files differ
diff --git a/res/drawable-finger/border_selected.9.png b/res/drawable-finger/border_selected.9.png
index e1d6cc1..c0b7097 100644
--- a/res/drawable-finger/border_selected.9.png
+++ b/res/drawable-finger/border_selected.9.png
Binary files differ
diff --git a/res/drawable-finger/dark_header.9.png b/res/drawable-finger/dark_header.9.png
deleted file mode 100644
index 5b1d71f..0000000
--- a/res/drawable-finger/dark_header.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/dark_header_dithered.xml b/res/drawable-finger/dark_header_dithered.xml
deleted file mode 100644
index 36994a7..0000000
--- a/res/drawable-finger/dark_header_dithered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/dark_header"
-    android:dither="true"
-/>
diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index 027af9a..a33d447 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -29,33 +29,29 @@
 
         <LinearLayout android:id="@+id/banner"
             android:layout_width="fill_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="@android:drawable/bottom_bar"
             android:padding="0dip"
             android:gravity="center_vertical"
             android:baselineAligned="false"
         >
 
             <FrameLayout
-                android:layout_width="58dip"
-                android:layout_height="58dip"
-                android:layout_marginLeft="6dip"
-                android:layout_marginRight="10dip"
+                android:layout_width="84dip"
+                android:layout_height="84dip"
+                android:layout_marginTop="4dip"
+                android:layout_marginLeft="3dip"
+                android:layout_marginBottom="3dip"
+                android:layout_marginRight="2dip"
             >
-                <ImageButton android:id="@+id/photoButton"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:src="@drawable/ic_menu_add_picture"
-                    android:gravity="center"
-                />
-
                 <ImageView android:id="@+id/photoImage"
                     style="?android:attr/imageWellStyle"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:clickable="true"
                     android:focusable="true"
+                    android:src="@drawable/ic_menu_add_picture"
+                    android:scaleType="center"
                     android:background="@drawable/border"
                 />
             </FrameLayout>
@@ -104,6 +100,8 @@
             <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="6dip"
             >
 
                 <TextView
@@ -111,7 +109,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="4dip"
                     android:text="@string/send_to_voicemail_checkbox"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                 />
@@ -121,7 +118,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_alignParentRight="true"
-                    android:nextFocusDown="@+id/saveButton"
                 />
 
             </RelativeLayout>
@@ -132,44 +128,77 @@
                 android:background="?android:attr/listDivider"
             />
 
-            <!-- The add more button -->
-            <Button android:id="@+id/addMore"
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:background="@android:drawable/dark_header"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textStyle="bold"
+                android:textSize="14sp"
+                android:text="@string/listSeparatorMore_edit"
+                android:paddingLeft="8dip"
+            />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+            />
+
+            <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
-                android:layout_marginTop="3dip"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/menu_addItem"
-                android:gravity="left|center_vertical"
-                android:drawableLeft="@android:drawable/ic_input_add"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:baselineAligned="false"
+            >
+
+                <!-- The add more button -->
+                <Button android:id="@+id/addMore"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="@string/add_more_items"
+                    android:gravity="left|center_vertical"
+                    android:background="@android:drawable/btn_dropdown"
+                />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="32dip"
             />
 
         </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:layout_marginTop="1dip"
+            android:layout_height="wrap_content"
+            android:paddingTop="5dip"
+            android:paddingLeft="4dip"
+            android:paddingRight="4dip"
+            android:paddingBottom="1dip"   
             android:background="@android:drawable/bottom_bar"
         >
+
             <Button android:id="@+id/saveButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:text="@string/button_save"
-                android:minWidth="120dip"
-                android:minHeight="48dip"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:text="@string/menu_done"
             />
 
             <Button android:id="@+id/discardButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
-                android:text="@string/button_discard"
-                android:minWidth="120dip"
-                android:minHeight="48dip"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:text="@string/menu_doNotSave"
             />
-        </RelativeLayout>
+
+        </LinearLayout>
+                
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout-finger/edit_contact_entry.xml b/res/layout-finger/edit_contact_entry.xml
index eb01782..8512dd4 100644
--- a/res/layout-finger/edit_contact_entry.xml
+++ b/res/layout-finger/edit_contact_entry.xml
@@ -38,7 +38,7 @@
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dip"
+            android:layout_marginLeft="4dip"
         />
 
         <ImageButton android:id="@+id/delete"
@@ -51,6 +51,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_org.xml b/res/layout-finger/edit_contact_entry_org.xml
index f29696b..a2f5863 100644
--- a/res/layout-finger/edit_contact_entry_org.xml
+++ b/res/layout-finger/edit_contact_entry_org.xml
@@ -50,7 +50,7 @@
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginLeft="4dip"
                 />
 
                 <ImageButton android:id="@+id/delete"
@@ -72,7 +72,7 @@
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginLeft="4dip"
                 />
 
                 <ImageButton android:id="@+id/delete2"
@@ -87,6 +87,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_ringtone.xml b/res/layout-finger/edit_contact_entry_ringtone.xml
index e566e31..b1665d7 100644
--- a/res/layout-finger/edit_contact_entry_ringtone.xml
+++ b/res/layout-finger/edit_contact_entry_ringtone.xml
@@ -23,37 +23,36 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:layout_marginTop="2dip"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
         android:gravity="center_vertical"
     >
 
+        <!-- We still provide a label for our parent, but we keep it hidden -->
         <TextView android:id="@+id/label"
-            android:layout_width="102dip"
-            android:layout_height="fill_parent"
-            android:paddingLeft="4dip"
-            android:gravity="left|center_vertical"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="0dip"
+            android:layout_height="0dip"
+            android:visibility="gone"
         />
 
         <Button android:id="@+id/data"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLargeInverse"
+            android:textAppearance="?android:attr/textAppearanceMediumInverse"
             android:baselineAligned="false"
             android:background="@android:drawable/btn_dropdown"
-            android:gravity="center_vertical"
+            android:gravity="left|center_vertical"
             android:maxLines="1"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
         />
-        
+
     </LinearLayout>
 
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_static_label.xml b/res/layout-finger/edit_contact_entry_static_label.xml
index 830872a..12c8148 100644
--- a/res/layout-finger/edit_contact_entry_static_label.xml
+++ b/res/layout-finger/edit_contact_entry_static_label.xml
@@ -54,6 +54,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_separator.xml b/res/layout-finger/edit_separator.xml
index 57bb53a..82fc12e 100644
--- a/res/layout-finger/edit_separator.xml
+++ b/res/layout-finger/edit_separator.xml
@@ -26,7 +26,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:background="@drawable/dark_header_dithered"
+        android:background="@android:drawable/dark_header"
         android:textColor="?android:attr/textColorSecondary"
         android:textStyle="bold"
         android:textSize="14sp"
diff --git a/res/layout-finger/list_separator.xml b/res/layout-finger/list_separator.xml
index e6f75ab..5d93d36 100644
--- a/res/layout-finger/list_separator.xml
+++ b/res/layout-finger/list_separator.xml
@@ -19,7 +19,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:background="@drawable/dark_header_dithered"
+    android:background="@android:drawable/dark_header"
     android:textColor="?android:attr/textColorSecondary"
     android:textStyle="bold"
     android:textSize="14sp"
diff --git a/res/layout-finger/view_contact.xml b/res/layout-finger/view_contact.xml
index e02e143..d52b447 100644
--- a/res/layout-finger/view_contact.xml
+++ b/res/layout-finger/view_contact.xml
@@ -24,7 +24,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="@android:drawable/title_bar"
+        android:background="@android:drawable/title_bar_tall"
         android:padding="0dip"
         android:gravity="center_vertical"
     >
diff --git a/res/layout-finger/view_contact_name.xml b/res/layout-finger/view_contact_name.xml
index 01a361b..126c69b 100644
--- a/res/layout-finger/view_contact_name.xml
+++ b/res/layout-finger/view_contact_name.xml
@@ -23,4 +23,6 @@
     android:textAppearance="?android:attr/textAppearanceLarge"
     android:shadowColor="#BB000000"
     android:shadowRadius="2.75"
+    android:maxLines="2"
+    android:ellipsize="end"
     />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d299e7f..b87ef27 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -28,7 +28,7 @@
     <string name="menu_newContact">"Nový kontakt"</string>
     <string name="menu_viewContact">"Zobrazit kontakt"</string>
     <string name="menu_callNumber">"Volat kontakt <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_addStar">"Přidat k oblíbeným položkám"</string>
+    <string name="menu_addStar">"Přidat do oblíbených"</string>
     <string name="menu_removeStar">"Odebrat z oblíbených položek"</string>
     <string name="menu_showBarcode">"Zobrazit čárový kód"</string>
     <string name="menu_editContact">"Upravit kontakt"</string>
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"Nastavit jako výchozí číslo"</string>
     <string name="deleteConfirmation_title">"Smazat"</string>
     <string name="deleteConfirmation">"Tento kontakt bude smazán."</string>
-    <string name="menu_done">"Uložit"</string>
+    <string name="menu_done">"Hotovo"</string>
     <string name="menu_doNotSave">"Zrušit změny"</string>
-    <string name="button_save">"Uložit"</string>
-    <string name="button_discard">"Zrušit změny"</string>
     <string name="editContact_title_edit">"Upravit kontakt"</string>
     <string name="editContact_title_insert">"Nový kontakt"</string>
     <string name="menu_addItem">"Další informace"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Foneticky"</string>
     <string name="label_notes">"Poznámky"</string>
     <string name="label_ringtone">"Vyzváněcí tón"</string>
     <string name="ghostData_name">"Jméno a příjmení"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Jméno (foneticky)"</string>
     <string name="ghostData_company">"Společnost"</string>
     <string name="ghostData_title">"Funkce"</string>
     <string name="ghostData_im">"Název v chatu"</string>
@@ -76,11 +72,11 @@
     <string name="errorDialogTitle">"Žádné fotografie"</string>
     <string name="photoPickerNotFoundText">"V telefonu nejsou žádné fotografie."</string>
     <string name="attachToContact">"Ikona kontaktu"</string>
-    <string name="customLabelPickerTitle">"Vlastní název štítku"</string>
+    <string name="customLabelPickerTitle">"Název vlastního štítku"</string>
     <string name="menu_displayGroup">"Zobrazit skupinu"</string>
     <string name="syncGroupPreference">"Upravit synchronizované skupiny"</string>
     <string name="importFromSim">"Importovat kontakty"</string>
-    <string name="send_to_voicemail_checkbox">"Přesměrovat hovory přímo do hlasové schránky."</string>
+    <string name="send_to_voicemail_checkbox">"Odesílat hovory přímo do hlasové pošty"</string>
     <string name="send_to_voicemail_view">"Hovory jsou přesměrovány přímo do hlasové schránky."</string>
     <string name="default_ringtone">"Výchozí"</string>
     <string name="addPicture">"Přidat ikonu"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Kontakt byl vytvořen."</string>
     <string name="contactSavedToast">"Kontakt byl uložen."</string>
     <string name="listSeparatorCallNumber">"Vytočit číslo"</string>
+    <string name="listSeparatorCallNumber_edit">"Telefonní čísla"</string>
     <string name="listSeparatorSendSmsMms">"Odeslat SMS nebo MMS"</string>
     <string name="listSeparatorSendEmail">"Odeslat e-mail"</string>
+    <string name="listSeparatorSendEmail_edit">"E-mailové adresy"</string>
     <string name="listSeparatorSendIm">"Odeslat zprávu chatu"</string>
+    <string name="listSeparatorSendIm_edit">"Rychlé zasílání zpráv"</string>
     <string name="listSeparatorMapAddress">"Adresa na mapě"</string>
+    <string name="listSeparatorMapAddress_edit">"Adresa na mapě"</string>
     <string name="listSeparatorOrganizations">"Organizace"</string>
     <string name="listSeparatorOtherInformation">"Ostatní informace"</string>
+    <string name="listSeparatorOtherInformation_edit">"Další možnosti"</string>
+    <string name="listSeparatorMore_edit">"Další"</string>
     <string name="contactsIconLabel">"Kontakty"</string>
     <string name="contactsFavoritesLabel">"Oblíbené"</string>
     <string name="dialerIconLabel">"Vytáčení"</string>
@@ -126,7 +128,7 @@
     <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>"Menu"</b></font>" a vyberte:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Upravit synchronizované skupiny"</b></font>", chcete-li 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>", chcete-li vytvořit zcela nový kontakt"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importovat kontakty"</b></font>", chcete-li přidat kontakty ze své karty SIM"\n</li></string>
+    <string name="noContactsHelpText">"Nemáte žádné kontakty."\n\n"Pokud chcete přidat kontakty, stiskněte tlačítko "<font fgcolor="#ffffffff"><b>"Nabídka"</b></font>" a vyberte:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Upravit skupiny synchronizace"</b></font>", pokud chcete přidat kontakty z nového nebo stávají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 z karty SIM"\n</li></string>
     <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>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Použít dotykovou tónovou klávesnici"</string>
     <string name="dialer_returnToInCallScreen">"Návrat k probíhajícímu hovoru"</string>
     <string name="dialer_addAnotherCall">"Přidat hovor"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"Detaily hovoru"</string>
+    <string name="toast_call_detail_error">"Detaily požadovaného hovoru nelze načíst."</string>
+    <string name="call_type">"Typ"</string>
+    <string name="type_incoming">"Příchozí volání"</string>
+    <string name="type_outgoing">"Odchozí volání"</string>
+    <string name="type_missed">"Zmeškané volání"</string>
+    <string name="call_time">"Čas"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Trvání"</string>
+    <string name="header_actions">"Akce"</string>
+    <string name="ringtone_spinner">"Vyzváněcí tón: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Přidat další položky"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f004268..489d43f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,10 +28,9 @@
     <string name="menu_newContact">"Neuer Kontakt"</string>
     <string name="menu_viewContact">"Kontakt anzeigen"</string>
     <string name="menu_callNumber">"<xliff:g id="NAME">%s</xliff:g> anrufen"</string>
-    <string name="menu_addStar">"Zu Favoriten hinzufügen"</string>
+    <string name="menu_addStar">"Favoriten hinzufügen"</string>
     <string name="menu_removeStar">"Aus Favoriten entfernen"</string>
-    <!-- no translation found for menu_showBarcode (309973637178814132) -->
-    <skip />
+    <string name="menu_showBarcode">"Barcode anzeigen"</string>
     <string name="menu_editContact">"Kontakt bearbeiten"</string>
     <string name="menu_deleteContact">"Kontakt löschen"</string>
     <string name="menu_call">"Anruf"</string>
@@ -41,23 +40,19 @@
     <string name="menu_makeDefaultNumber">"Als Standardnummer festlegen"</string>
     <string name="deleteConfirmation_title">"Löschen"</string>
     <string name="deleteConfirmation">"Dieser Kontakt wird gelöscht."</string>
-    <string name="menu_done">"Speichern"</string>
+    <string name="menu_done">"Fertig"</string>
     <string name="menu_doNotSave">"Änderungen löschen"</string>
-    <string name="button_save">"Speichern"</string>
-    <string name="button_discard">"Änderungen löschen"</string>
     <string name="editContact_title_edit">"Kontakt bearbeiten"</string>
     <string name="editContact_title_insert">"Neuer Kontakt"</string>
     <string name="menu_addItem">"Weitere Informationen"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Phonetisch"</string>
     <string name="label_notes">"Notizen"</string>
     <string name="label_ringtone">"Klingelton"</string>
     <string name="ghostData_name">"Vor- und Nachname"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Phonetischer Name"</string>
     <string name="ghostData_company">"Unternehmen"</string>
     <string name="ghostData_title">"Position"</string>
-    <string name="ghostData_im">"IM-Name"</string>
+    <string name="ghostData_im">"Chat-Name"</string>
     <string name="ghostData_notes">"Meine Notiz"</string>
     <string name="ghostData_phone">"Telefonnummer"</string>
     <string name="ghostData_email">"E-Mail-Adresse"</string>
@@ -67,7 +62,7 @@
     <string name="selectLabel">"Wählen Sie ein Label aus."</string>
     <string name="phoneLabelsGroup">"Telefon"</string>
     <string name="emailLabelsGroup">"E-Mail"</string>
-    <string name="imLabelsGroup">"IM"</string>
+    <string name="imLabelsGroup">"Chat"</string>
     <string name="postalLabelsGroup">"Postanschrift"</string>
     <string name="otherLabelsGroup">"Sonstiges"</string>
   <string-array name="otherLabels">
@@ -77,12 +72,11 @@
     <string name="errorDialogTitle">"Keine Bilder"</string>
     <string name="photoPickerNotFoundText">"Auf dem Telefon sind keine Bilder verfügbar."</string>
     <string name="attachToContact">"Kontaktsymbol"</string>
-    <!-- no translation found for customLabelPickerTitle (1081475101983255212) -->
-    <skip />
+    <string name="customLabelPickerTitle">"Name des benutzerdefinierten Labels"</string>
     <string name="menu_displayGroup">"Gruppe anzeigen"</string>
     <string name="syncGroupPreference">"Synchron. bearbeiten"</string>
     <string name="importFromSim">"Kontakte importieren"</string>
-    <string name="send_to_voicemail_checkbox">"Anrufe direkt an Mailbox senden"</string>
+    <string name="send_to_voicemail_checkbox">"Anrufe direkt an Voicemail senden"</string>
     <string name="send_to_voicemail_view">"Anrufe werden direkt an Mailbox gesendet"</string>
     <string name="default_ringtone">"Standard"</string>
     <string name="addPicture">"Symbol hinzufügen"</string>
@@ -90,8 +84,7 @@
     <string name="noContacts">"Keine Kontakte"</string>
     <string name="noContactsWithPhoneNumbers">"Keine Kontakte mit Telefonnummern"</string>
     <string name="noFavorites">"Keine Favoriten"</string>
-    <!-- no translation found for select_group_title (7955698611959835612) -->
-    <skip />
+    <string name="select_group_title">"Gruppen"</string>
     <string name="groupEmpty">"Ihre Gruppe \"<xliff:g id="GROUPNAME">%s</xliff:g>\" ist leer."</string>
     <string name="showAllGroups">"Alle Kontakte"</string>
     <string name="syncAllGroups">"Alle Kontakte synchronisieren"</string>
@@ -100,26 +93,29 @@
     <string name="contactCreatedToast">"Kontakt erstellt"</string>
     <string name="contactSavedToast">"Kontakt gespeichert"</string>
     <string name="listSeparatorCallNumber">"Rufnummer"</string>
+    <string name="listSeparatorCallNumber_edit">"Telefonnummern"</string>
     <string name="listSeparatorSendSmsMms">"SMS/MMS senden"</string>
     <string name="listSeparatorSendEmail">"E-Mail senden"</string>
-    <string name="listSeparatorSendIm">"Per Chat (IM) kontaktieren"</string>
+    <string name="listSeparatorSendEmail_edit">"E-Mail-Adressen"</string>
+    <string name="listSeparatorSendIm">"Per Chat kontaktieren"</string>
+    <string name="listSeparatorSendIm_edit">"Instant Messenger"</string>
     <string name="listSeparatorMapAddress">"Adresse in Maps"</string>
+    <string name="listSeparatorMapAddress_edit">"Adresse auf der Karte"</string>
     <string name="listSeparatorOrganizations">"Organisationen"</string>
     <string name="listSeparatorOtherInformation">"Mehr Informationen"</string>
+    <string name="listSeparatorOtherInformation_edit">"Sonstige Optionen"</string>
+    <string name="listSeparatorMore_edit">"Mehr"</string>
     <string name="contactsIconLabel">"Kontakte"</string>
     <string name="contactsFavoritesLabel">"Favoriten"</string>
     <string name="dialerIconLabel">"Telefon"</string>
     <string name="recentCallsIconLabel">"Anrufe"</string>
-    <!-- no translation found for liveFolderAll (4789010460767506206) -->
-    <skip />
-    <!-- no translation found for liveFolderFavorites (3100957542927222282) -->
-    <skip />
-    <!-- no translation found for liveFolderPhone (3739376066610926780) -->
-    <skip />
+    <string name="liveFolderAll">"Alle Kontakte"</string>
+    <string name="liveFolderFavorites">"Markierte Kontakte"</string>
+    <string name="liveFolderPhone">"Kontakte mit Telefonnummern"</string>
     <string name="menu_sendTextMessage">"SMS-Nachricht senden"</string>
     <string name="recentCalls_callNumber">"<xliff:g id="NAME">%s</xliff:g> anrufen"</string>
     <string name="recentCalls_editNumberBeforeCall">"Nummer vor Anruf bearbeiten"</string>
-    <string name="recentCalls_addToContact">"Kontakten hinzufügen"</string>
+    <string name="recentCalls_addToContact">"Zu Kontakten hinzufügen"</string>
     <string name="recentCalls_removeFromRecentList">"Aus Anrufliste entfernen"</string>
     <string name="recentCalls_deleteAll">"Anrufliste löschen"</string>
     <string name="recentCalls_empty">"Anrufliste ist leer"</string>
@@ -128,43 +124,28 @@
     <string name="unknown">"Unbekannt"</string>
     <string name="private_num">"Private Nummer"</string>
     <string name="dialerKeyboardHintText">"Mit Tastatur wählen"</string>
-    <!-- no translation found for dialerDialpadHintText (5824490365898349041) -->
-    <skip />
+    <string name="dialerDialpadHintText">"Zum Hinzufügen eines Anrufs wählen"</string>
     <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>
+    <string name="noContactsHelpText">"Sie haben keine Kontakte."\n\n"Drücken Sie zum Hinzufügen die "<font fgcolor="#ffffffff"><b>"Menütaste"</b></font>" und wählen Sie"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Synchronisierungsgruppen bearbeiten"</b></font>", um Kontakte mit einem neuen oder bestehenden Google-Konto zu synchronisieren,"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Neuer Kontakt"</b></font>", um einen Kontakt neu zu erstellen, "\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Kontakte importieren"</b></font>", um Kontakte von Ihrer SIM-Karte hinzuzufügen."\n</li></string>
     <string name="seclectSyncGroups_title">"Zu synchronisierende Gruppen auswählen"</string>
-    <!-- no translation found for liveFolder_all_label (1552523730090319259) -->
-    <skip />
-    <!-- no translation found for liveFolder_favorites_label (2674341514070517105) -->
-    <skip />
-    <!-- no translation found for liveFolder_phones_label (1709786878793436245) -->
-    <skip />
-    <!-- no translation found for dialer_useDtmfDialpad (1707548397435075040) -->
-    <skip />
-    <!-- no translation found for dialer_returnToInCallScreen (3719386377550913067) -->
-    <skip />
-    <!-- no translation found for dialer_addAnotherCall (4205688819890074468) -->
-    <skip />
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="liveFolder_all_label">"Alle Kontakte"</string>
+    <string name="liveFolder_favorites_label">"Markiert"</string>
+    <string name="liveFolder_phones_label">"Telefone"</string>
+    <string name="dialer_useDtmfDialpad">"Telefontastatur verwenden"</string>
+    <string name="dialer_returnToInCallScreen">"Zurück zum Anruf läuft"</string>
+    <string name="dialer_addAnotherCall">"Anruf hinzufügen"</string>
+    <string name="callDetailTitle">"Anrufdetails"</string>
+    <string name="toast_call_detail_error">"Details für den angeforderten Anruf konnten nicht gelesen werden."</string>
+    <string name="call_type">"Typ"</string>
+    <string name="type_incoming">"Eingehender Anruf"</string>
+    <string name="type_outgoing">"Ausgehender Anruf"</string>
+    <string name="type_missed">"Verpasster Anruf"</string>
+    <string name="call_time">"Zeit"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Dauer"</string>
+    <string name="header_actions">"Aktionen"</string>
+    <string name="ringtone_spinner">"Klingelton: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Weitere Elemente hinzufügen"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b26e9ae..67bf0cf 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -30,8 +30,6 @@
     <string name="deleteConfirmation">"This contact will be deleted."</string>
     <string name="menu_done">"Save"</string>
     <string name="menu_doNotSave">"Discard changes"</string>
-    <string name="button_save">"Save"</string>
-    <string name="button_discard">"Discard changes"</string>
     <string name="editContact_title_edit">"Edit contact"</string>
     <string name="editContact_title_insert">"New contact"</string>
     <string name="menu_addItem">"More info"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index 2f8a286..0000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="contactsList">"Contactos"</string>
-    <!-- no translation found for shortcutContact (1520089872483067797) -->
-    <skip />
-    <string name="starredList">"Con estrella"</string>
-    <string name="frequentList">"Frecuente"</string>
-    <string name="strequentList">"Favoritos"</string>
-    <!-- no translation found for viewContactTitle (5340316765801746261) -->
-    <skip />
-    <!-- no translation found for viewContactDesription (5593543465183236254) -->
-    <skip />
-    <!-- no translation found for editContactDescription (207393633337592309) -->
-    <skip />
-    <!-- no translation found for insertContactDescription (8392185611221432248) -->
-    <skip />
-    <string name="searchHint">"Buscar contactos"</string>
-    <string name="menu_newContact">"Nuevo contacto"</string>
-    <string name="menu_viewContact">"Ver contacto"</string>
-    <!-- unknown placeholder CONTACT in menu_callNumber -->
-    <skip />
-    <string name="menu_addStar">"Agregar estrella"</string>
-    <string name="menu_removeStar">"Quitar estrella"</string>
-    <!-- no translation found for menu_showBarcode (4627916987700748636) -->
-    <skip />
-    <string name="menu_editContact">"Editar contacto"</string>
-    <string name="menu_deleteContact">"Eliminar contacto"</string>
-    <string name="menu_call">"Llamar"</string>
-    <string name="menu_sendSMS">"Enviar texto"</string>
-    <string name="menu_sendEmail">"Enviar correo electrónico"</string>
-    <string name="menu_viewAddress">"Dirección en el mapa"</string>
-    <string name="menu_makeDefaultNumber">"Convertir en número predeterminado"</string>
-    <!-- no translation found for deleteConfirmation_title (1628057421142368583) -->
-    <skip />
-    <string name="deleteConfirmation">"¿Eliminar este contacto?"</string>
-    <string name="menu_done">"Guardar"</string>
-    <string name="menu_doNotSave">"Rechazar cambios"</string>
-    <string name="button_save">"Guardar"</string>
-    <string name="button_discard">"Rechazar cambios"</string>
-    <string name="editContact_title_edit">"Editar contacto"</string>
-    <string name="editContact_title_insert">"Nuevo contacto"</string>
-    <string name="menu_addItem">"Agregar más"</string>
-    <string name="label_notes">"Notas"</string>
-    <!-- no translation found for label_ringtone (1269538172838343970) -->
-    <skip />
-    <string name="ghostData_name">"Nombre y apellido"</string>
-    <string name="ghostData_company">"Organización"</string>
-    <string name="ghostData_title">"Puesto"</string>
-    <string name="ghostData_im">"Nombre MI"</string>
-    <string name="ghostData_notes">"Mi nota"</string>
-    <string name="ghostData_phone">"Número de teléfono"</string>
-    <string name="ghostData_email">"Dirección de correo electrónico"</string>
-    <!-- unknown placeholder BREAK_0 in ghostData_postal -->
-    <skip />
-    <string name="invalidContactMessage">"Los contactos deben tener nombres"</string>
-    <string name="pickerNewContactHeader">"Crear nuevo contacto"</string>
-    <string name="selectLabel">"Seleccionar etiqueta"</string>
-    <string name="phoneLabelsGroup">"Teléfono"</string>
-    <string name="emailLabelsGroup">"C. electrónico"</string>
-    <string name="imLabelsGroup">"MI"</string>
-    <string name="postalLabelsGroup">"Dirección postal"</string>
-    <string name="otherLabelsGroup">"Otros"</string>
-    <!-- no translation found for otherLabels:0 (3318569574569948132) -->
-    <!-- no translation found for otherLabels:1 (3325413568383685728) -->
-    <string name="errorDialogTitle">"¡Atención!"</string>
-    <string name="photoPickerNotFoundText">"Ninguna imagen disponible."</string>
-    <string name="attachToContact">"Foto de los contactos"</string>
-    <string name="customLabelPickerTitle">"Etiqueta personalizada"</string>
-    <!-- no translation found for menu_displayGroup (2835746769742496686) -->
-    <skip />
-    <!-- no translation found for syncGroupPreference (759121296595419145) -->
-    <skip />
-    <string name="importFromSim">"Importar de tarjeta SIM"</string>
-    <!-- no translation found for alphabet (4977128516779796464) -->
-    <skip />
-    <!-- no translation found for send_to_voicemail_checkbox (1699633783417579410) -->
-    <skip />
-    <!-- no translation found for send_to_voicemail_view (4299389800446371057) -->
-    <skip />
-    <!-- no translation found for default_ringtone (3998437793418131562) -->
-    <skip />
-    <!-- no translation found for addPicture (7010902051370875352) -->
-    <skip />
-    <!-- no translation found for removePicture (2322840177008417519) -->
-    <skip />
-    <!-- no translation found for noContacts (7515781671301309298) -->
-    <skip />
-    <!-- no translation found for noContactsWithPhoneNumbers (3105170743499016241) -->
-    <skip />
-    <!-- no translation found for noFavorites (7957536428532225634) -->
-    <skip />
-    <!-- no translation found for select_group_title (8821785850959403592) -->
-    <skip />
-    <!-- no translation found for groupEmpty (1733723844723885242) -->
-    <skip />
-    <!-- no translation found for showAllGroups (4524662887308889400) -->
-    <skip />
-    <!-- no translation found for syncAllGroups (8415112909188430211) -->
-    <skip />
-    <!-- no translation found for groupNameMyContacts (1298661863710879264) -->
-    <skip />
-    <!-- no translation found for groupNameWithPhones (4051877952712463294) -->
-    <skip />
-    <!-- no translation found for contactCreatedToast (5309869712901550955) -->
-    <skip />
-    <!-- no translation found for contactSavedToast (1228932477738680325) -->
-    <skip />
-    <!-- no translation found for listSeparatorCallNumber (9142725721395758026) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendSmsMms (8878062000446372333) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendEmail (3813935531061488274) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendIm (3885045096980470847) -->
-    <skip />
-    <!-- no translation found for listSeparatorMapAddress (7749519405208811410) -->
-    <skip />
-    <!-- no translation found for listSeparatorOrganizations (5731454670822188295) -->
-    <skip />
-    <!-- no translation found for listSeparatorOtherInformation (3399084175925138065) -->
-    <skip />
-    <!-- no translation found for contactsIconLabel (392729648321810378) -->
-    <skip />
-    <!-- no translation found for contactsFavoritesLabel (6274307000699136596) -->
-    <skip />
-    <!-- no translation found for dialerIconLabel (396765298398417139) -->
-    <skip />
-    <!-- no translation found for recentCallsIconLabel (7432201162713288826) -->
-    <skip />
-    <!-- no translation found for liveFolderAll (5991510762804226223) -->
-    <skip />
-    <!-- no translation found for liveFolderFavorites (8755759874416875970) -->
-    <skip />
-    <!-- no translation found for liveFolderPhone (3440101264360244544) -->
-    <skip />
-    <!-- no translation found for menu_sendTextMessage (3055919380461974147) -->
-    <skip />
-    <!-- no translation found for recentCalls_callNumber (924407199258234369) -->
-    <skip />
-    <!-- no translation found for recentCalls_editNumberBeforeCall (7859145185424954030) -->
-    <skip />
-    <!-- no translation found for recentCalls_addToContact (6950267092567953305) -->
-    <skip />
-    <!-- no translation found for recentCalls_removeFromRecentList (5273789011391059975) -->
-    <skip />
-    <!-- no translation found for recentCalls_deleteAll (425798199678070888) -->
-    <skip />
-    <!-- no translation found for recentCalls_empty (7787624895504983911) -->
-    <skip />
-    <!-- no translation found for imei (1052536402066249452) -->
-    <skip />
-    <!-- no translation found for voicemail (1135686231023059817) -->
-    <skip />
-    <!-- no translation found for unknown (6231893925212017656) -->
-    <skip />
-    <!-- no translation found for private_num (3065614133902647350) -->
-    <skip />
-    <!-- no translation found for dialerKeyboardHintText (2013777173021862941) -->
-    <skip />
-    <!-- no translation found for simContacts_emptyLoading (4828419758306519589) -->
-    <skip />
-    <!-- no translation found for simContacts_title (4162577066960174009) -->
-    <skip />
-    <!-- no translation found for contactsSyncPlug (1549212649158409469) -->
-    <skip />
-    <!-- no translation found for noContactsHelpText (6155730972704522463) -->
-    <skip />
-    <!-- no translation found for seclectSyncGroups_title (7675331949118054911) -->
-    <skip />
-    <!-- no translation found for liveFolder_all_label (3716551598022430019) -->
-    <skip />
-    <!-- no translation found for liveFolder_favorites_label (9053985659909059395) -->
-    <skip />
-    <!-- no translation found for liveFolder_phones_label (8943901400107401868) -->
-    <skip />
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9251140..0f750b9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -40,20 +40,16 @@
     <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">"Guardar"</string>
+    <string name="menu_done">"Finalizado"</string>
     <string name="menu_doNotSave">"Descartar cambios"</string>
-    <string name="button_save">"Guardar"</string>
-    <string name="button_discard">"Descartar cambios"</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>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Pronunciación"</string>
     <string name="label_notes">"Notas"</string>
     <string name="label_ringtone">"Tono"</string>
     <string name="ghostData_name">"Nombre y apellido"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Transcripción fonética del nombre"</string>
     <string name="ghostData_company">"Empresa"</string>
     <string name="ghostData_title">"Posición"</string>
     <string name="ghostData_im">"Nombre de MI"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"Mostrar grupo"</string>
     <string name="syncGroupPreference">"Editar grupos de sincronización"</string>
     <string name="importFromSim">"Importar contactos"</string>
-    <string name="send_to_voicemail_checkbox">"Enviar llamadas directamente al buzón de voz"</string>
+    <string name="send_to_voicemail_checkbox">"Enviar llamadas directamente como mensajes de voz"</string>
     <string name="send_to_voicemail_view">"Las llamadas se envían directamente al buzón de voz."</string>
     <string name="default_ringtone">"Predeterminado"</string>
     <string name="addPicture">"Añadir icono"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Se ha creado el contacto."</string>
     <string name="contactSavedToast">"El contacto se ha guardado."</string>
     <string name="listSeparatorCallNumber">"Marcar número"</string>
+    <string name="listSeparatorCallNumber_edit">"Números de teléfono"</string>
     <string name="listSeparatorSendSmsMms">"Enviar SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"Enviar mensaje de correo electrónico"</string>
+    <string name="listSeparatorSendEmail_edit">"Direcciones de correo electrónico"</string>
     <string name="listSeparatorSendIm">"Enviar mensaje instantáneo"</string>
+    <string name="listSeparatorSendIm_edit">"Mensajería instantánea"</string>
     <string name="listSeparatorMapAddress">"Dirección en mapa"</string>
+    <string name="listSeparatorMapAddress_edit">"Asignar dirección"</string>
     <string name="listSeparatorOrganizations">"Organizaciones"</string>
     <string name="listSeparatorOtherInformation">"Otra información"</string>
+    <string name="listSeparatorOtherInformation_edit">"Otras opciones"</string>
+    <string name="listSeparatorMore_edit">"Más"</string>
     <string name="contactsIconLabel">"Contactos"</string>
     <string name="contactsFavoritesLabel">"Favoritos"</string>
     <string name="dialerIconLabel">"Marcación"</string>
@@ -126,7 +128,7 @@
     <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>"Menú"</b></font>" y selecciona:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Editar grupos de sincronización"</b></font>" para añadir contactos de una cuenta de Google nueva o existente"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un contacto desde cero"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadir contactos de tu tarjeta SIM"\n</li></string>
+    <string name="noContactsHelpText">"No tienes ningún contacto."\n\n"Para añadir contactos, pulsa "<font fgcolor="#ffffffff"><b>"Menú"</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="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>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Usar el teclado de tonos"</string>
     <string name="dialer_returnToInCallScreen">"Volver a la llamada en curso"</string>
     <string name="dialer_addAnotherCall">"Añadir llamada"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"Detalles de la llamada"</string>
+    <string name="toast_call_detail_error">"No se han podido leer los detalles de la llamada solicitada."</string>
+    <string name="call_type">"Tipo"</string>
+    <string name="type_incoming">"Llamada entrante"</string>
+    <string name="type_outgoing">"Llamada saliente"</string>
+    <string name="type_missed">"Llamada perdida"</string>
+    <string name="call_time">"Hora"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Duración"</string>
+    <string name="header_actions">"Acciones"</string>
+    <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>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 88285b0..9d921c0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"Numéro téléphone par défaut"</string>
     <string name="deleteConfirmation_title">"Supprimer"</string>
     <string name="deleteConfirmation">"Ce contact sera supprimé."</string>
-    <string name="menu_done">"Enregistrer"</string>
+    <string name="menu_done">"Terminé"</string>
     <string name="menu_doNotSave">"Annuler les modifications"</string>
-    <string name="button_save">"Enregistrer"</string>
-    <string name="button_discard">"Annuler les modifications"</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>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Prononciation phonétique"</string>
     <string name="label_notes">"Remarques"</string>
     <string name="label_ringtone">"Sonnerie"</string>
     <string name="ghostData_name">"Premier et dernier"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <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>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"Afficher les groupes"</string>
     <string name="syncGroupPreference">"Modifier les groupes à synchroniser"</string>
     <string name="importFromSim">"Importer des contacts"</string>
-    <string name="send_to_voicemail_checkbox">"Renvoyer les appels directement vers la boîte vocale."</string>
+    <string name="send_to_voicemail_checkbox">"Envoyer les appels directement en tant que message vocal"</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>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Contact créé."</string>
     <string name="contactSavedToast">"Contact enregistré."</string>
     <string name="listSeparatorCallNumber">"Composer le numéro"</string>
+    <string name="listSeparatorCallNumber_edit">"Numéros de téléphone"</string>
     <string name="listSeparatorSendSmsMms">"Envoyer un SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"Envoyer un e-mail"</string>
+    <string name="listSeparatorSendEmail_edit">"Adresses e-mail"</string>
     <string name="listSeparatorSendIm">"Envoyer un message instantané"</string>
+    <string name="listSeparatorSendIm_edit">"Instant Messenger"</string>
     <string name="listSeparatorMapAddress">"Adresse sur un plan"</string>
+    <string name="listSeparatorMapAddress_edit">"Adresse postale"</string>
     <string name="listSeparatorOrganizations">"Organisations"</string>
     <string name="listSeparatorOtherInformation">"Autres informations"</string>
+    <string name="listSeparatorOtherInformation_edit">"Autres options"</string>
+    <string name="listSeparatorMore_edit">"Plus"</string>
     <string name="contactsIconLabel">"Contacts"</string>
     <string name="contactsFavoritesLabel">"Favoris"</string>
     <string name="dialerIconLabel">"Numéroteur"</string>
@@ -126,7 +128,7 @@
     <string name="simContacts_emptyLoading">"Chargement depuis la carte SIM..."</string>
     <string name="simContacts_title">"Contacts de carte SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronisez vos contacts Google !"</font>" "\n"Une fois que vous aurez synchronisé votre téléphone, vos contacts seront disponibles, où que vous soyez."</string>
-    <string name="noContactsHelpText">"Vous n\'avez pas de contacts."\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>"Modifier les groupes à synchroniser"</b></font>" pour ajouter des contacts d\'un compte existant ou d\'un nouveau compte Google"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un tout nouveau contact"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts de votre carte SIM"\n</li>"."</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>"Modifier les groupes synchronisés"</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 de toutes pièces"\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="seclectSyncGroups_title">"Sélectionner les groupes à synchroniser"</string>
     <string name="liveFolder_all_label">"Tous les contacts"</string>
     <string name="liveFolder_favorites_label">"Suivis"</string>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Utiliser le clavier DTMF"</string>
     <string name="dialer_returnToInCallScreen">"Reprendre l\'appel en cours"</string>
     <string name="dialer_addAnotherCall">"Ajouter un appel"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"Détails sur l\'appel"</string>
+    <string name="toast_call_detail_error">"Impossible de consulter les détails de l\'appel demandé."</string>
+    <string name="call_type">"Type"</string>
+    <string name="type_incoming">"Appel entrant"</string>
+    <string name="type_outgoing">"Appel sortant"</string>
+    <string name="type_missed">"Appel manqué"</string>
+    <string name="call_time">"Heure"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Durée"</string>
+    <string name="header_actions">"Actions"</string>
+    <string name="ringtone_spinner">"Sonnerie : <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Ajouter d\'autres éléments"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2b16d13..0b00fac 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -40,20 +40,16 @@
     <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">"Salva"</string>
+    <string name="menu_done">"Completato"</string>
     <string name="menu_doNotSave">"Ignora modifiche"</string>
-    <string name="button_save">"Salva"</string>
-    <string name="button_discard">"Ignora modifiche"</string>
     <string name="editContact_title_edit">"Modifica contatto"</string>
     <string name="editContact_title_insert">"Nuovo contatto"</string>
     <string name="menu_addItem">"Altre info"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Fonetica"</string>
     <string name="label_notes">"Note"</string>
     <string name="label_ringtone">"Suoneria"</string>
     <string name="ghostData_name">"Nome e cognome"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <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>
@@ -80,7 +76,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 chiamate direttamente a segreteria."</string>
+    <string name="send_to_voicemail_checkbox">"Inoltra le chiamate direttamente alla posta vocale"</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>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Contatto creato."</string>
     <string name="contactSavedToast">"Contatto salvato."</string>
     <string name="listSeparatorCallNumber">"Componi numero"</string>
+    <string name="listSeparatorCallNumber_edit">"Numeri di telefono"</string>
     <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_edit">"Messaggistica istantanea"</string>
     <string name="listSeparatorMapAddress">"Indirizzo su mappa"</string>
+    <string name="listSeparatorMapAddress_edit">"Visualizza indirizzo nella mappa"</string>
     <string name="listSeparatorOrganizations">"Organizzazioni"</string>
     <string name="listSeparatorOtherInformation">"Altre informazioni"</string>
+    <string name="listSeparatorOtherInformation_edit">"Altre opzioni"</string>
+    <string name="listSeparatorMore_edit">"Altro"</string>
     <string name="contactsIconLabel">"Contatti"</string>
     <string name="contactsFavoritesLabel">"Preferiti"</string>
     <string name="dialerIconLabel">"Dialer"</string>
@@ -126,7 +128,7 @@
     <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 esistono contatti."\n\n"Per aggiungere contatti, premi "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e seleziona:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Modifica sincr. gruppi"</b></font>" per aggiungere contatti da un account Google nuovo o esistente"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nuovo contatto"</b></font>" per creare un nuovo contatto"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importa contatti"</b></font>" per aggiungere contatti dalla SIM"\n</li></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="seclectSyncGroups_title">"Seleziona i gruppi da sincronizzare"</string>
     <string name="liveFolder_all_label">"Tutti i contatti"</string>
     <string name="liveFolder_favorites_label">"Speciali"</string>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Usa la tastiera per la selezione a toni"</string>
     <string name="dialer_returnToInCallScreen">"Torna alla chiamata in corso"</string>
     <string name="dialer_addAnotherCall">"Aggiungi chiamata"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <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>
+    <string name="type_incoming">"Chiamata in arrivo"</string>
+    <string name="type_outgoing">"Chiamata in uscita"</string>
+    <string name="type_missed">"Chiamata persa"</string>
+    <string name="call_time">"Ora"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <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>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 18a280e..6c09fb5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,9 +23,9 @@
     <string name="viewContactTitle">"連絡先情報"</string>
     <string name="viewContactDesription">"連絡先を表示"</string>
     <string name="editContactDescription">"連絡先を編集"</string>
-    <string name="insertContactDescription">"連絡先を作成"</string>
+    <string name="insertContactDescription">"連絡先を新規登録"</string>
     <string name="searchHint">"連絡先を検索"</string>
-    <string name="menu_newContact">"新しい連絡先"</string>
+    <string name="menu_newContact">"連絡先を新規登録"</string>
     <string name="menu_viewContact">"連絡先を表示"</string>
     <string name="menu_callNumber">"<xliff:g id="NAME">%s</xliff:g>さんに発信"</string>
     <string name="menu_addStar">"お気に入りに追加"</string>
@@ -37,23 +37,19 @@
     <string name="menu_sendSMS">"SMS/MMSを送信"</string>
     <string name="menu_sendEmail">"メールを送信"</string>
     <string name="menu_viewAddress">"地図でみる"</string>
-    <string name="menu_makeDefaultNumber">"デフォルトの番号に設定"</string>
+    <string name="menu_makeDefaultNumber">"メインの番号に設定する"</string>
     <string name="deleteConfirmation_title">"削除"</string>
     <string name="deleteConfirmation">"この連絡先を削除します。"</string>
-    <string name="menu_done">"保存"</string>
-    <string name="menu_doNotSave">"変更を破棄"</string>
-    <string name="button_save">"保存"</string>
-    <string name="button_discard">"変更を破棄"</string>
+    <string name="menu_done">"完了"</string>
+    <string name="menu_doNotSave">"変更取消"</string>
     <string name="editContact_title_edit">"連絡先を編集"</string>
-    <string name="editContact_title_insert">"新しい連絡先"</string>
+    <string name="editContact_title_insert">"連絡先を新規登録"</string>
     <string name="menu_addItem">"情報を追加"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"音声"</string>
     <string name="label_notes">"メモ"</string>
     <string name="label_ringtone">"着信音"</string>
     <string name="ghostData_name">"名前"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"音声名"</string>
     <string name="ghostData_company">"会社"</string>
     <string name="ghostData_title">"役職"</string>
     <string name="ghostData_im">"IM名"</string>
@@ -61,97 +57,95 @@
     <string name="ghostData_phone">"電話番号"</string>
     <string name="ghostData_email">"メールアドレス"</string>
     <string name="ghostData_postal">"住所"</string>
-    <string name="invalidContactMessage">"連絡先が存在しません。"</string>
-    <string name="pickerNewContactHeader">"新しい連絡先を登録"</string>
-    <string name="selectLabel">"ラベルを選択"</string>
+    <string name="invalidContactMessage">"この連絡先は消去されています。"</string>
+    <string name="pickerNewContactHeader">"連絡先を新規登録"</string>
+    <string name="selectLabel">"選択してください"</string>
     <string name="phoneLabelsGroup">"電話番号"</string>
     <string name="emailLabelsGroup">"メール"</string>
     <string name="imLabelsGroup">"IM"</string>
     <string name="postalLabelsGroup">"住所"</string>
     <string name="otherLabelsGroup">"その他"</string>
   <string-array name="otherLabels">
-    <item>"組織"</item>
+    <item>"勤務先情報"</item>
     <item>"メモ"</item>
   </string-array>
     <string name="errorDialogTitle">"写真なし"</string>
-    <string name="photoPickerNotFoundText">"使用できる写真が携帯電話にありません。"</string>
+    <string name="photoPickerNotFoundText">"写真がありません。"</string>
     <string name="attachToContact">"連絡先のアイコン"</string>
     <string name="customLabelPickerTitle">"新しいラベル名"</string>
     <string name="menu_displayGroup">"グループを表示"</string>
     <string name="syncGroupPreference">"同期グループを編集"</string>
     <string name="importFromSim">"連絡先をインポート"</string>
-    <string name="send_to_voicemail_checkbox">"電話はボイスメールに送信する"</string>
-    <string name="send_to_voicemail_view">"着信はボイスメールに直接転送されます。"</string>
+    <string name="send_to_voicemail_checkbox">"ボイスメールに直接電話します。"</string>
+    <string name="send_to_voicemail_view">"この番号にかけるとボイスメールに送信されます。"</string>
     <string name="default_ringtone">"デフォルト"</string>
     <string name="addPicture">"アイコンを追加"</string>
     <string name="removePicture">"アイコンを削除"</string>
     <string name="noContacts">"連絡先がありません。"</string>
-    <string name="noContactsWithPhoneNumbers">"電話番号のある連絡先がありません。"</string>
-    <string name="noFavorites">"お気に入りがありません。"</string>
+    <string name="noContactsWithPhoneNumbers">"電話番号付きの連絡先はありません。"</string>
+    <string name="noFavorites">"お気に入りなし"</string>
     <string name="select_group_title">"グループ"</string>
     <string name="groupEmpty">"「<xliff:g id="GROUPNAME">%s</xliff:g>」グループには何も登録されていません。"</string>
     <string name="showAllGroups">"すべての連絡先"</string>
-    <string name="syncAllGroups">"全連絡先の同期を取る"</string>
+    <string name="syncAllGroups">"全連絡先を同期"</string>
     <string name="groupNameMyContacts">"Myコンタクト"</string>
     <string name="groupNameWithPhones">"電話番号のある連絡先"</string>
     <string name="contactCreatedToast">"連絡先を作成しました。"</string>
     <string name="contactSavedToast">"連絡先を保存しました。"</string>
     <string name="listSeparatorCallNumber">"電話をかける"</string>
+    <string name="listSeparatorCallNumber_edit">"電話番号"</string>
     <string name="listSeparatorSendSmsMms">"SMS/MMSを送信"</string>
     <string name="listSeparatorSendEmail">"メールを送信"</string>
+    <string name="listSeparatorSendEmail_edit">"メールアドレス"</string>
     <string name="listSeparatorSendIm">"インスタントメッセージを送信"</string>
-    <string name="listSeparatorMapAddress">"住所を地図でみる"</string>
-    <string name="listSeparatorOrganizations">"組織"</string>
+    <string name="listSeparatorSendIm_edit">"インスタントメッセンジャー"</string>
+    <string name="listSeparatorMapAddress">"地図でみる"</string>
+    <string name="listSeparatorMapAddress_edit">"マップアドレス"</string>
+    <string name="listSeparatorOrganizations">"勤務先情報"</string>
     <string name="listSeparatorOtherInformation">"その他の情報"</string>
+    <string name="listSeparatorOtherInformation_edit">"その他のオプション"</string>
+    <string name="listSeparatorMore_edit">"開く"</string>
     <string name="contactsIconLabel">"連絡先"</string>
     <string name="contactsFavoritesLabel">"お気に入り"</string>
     <string name="dialerIconLabel">"通話"</string>
-    <string name="recentCallsIconLabel">"通話ログ"</string>
+    <string name="recentCallsIconLabel">"通話履歴"</string>
     <string name="liveFolderAll">"すべての連絡先"</string>
     <string name="liveFolderFavorites">"スター付きの連絡先"</string>
     <string name="liveFolderPhone">"電話番号のある連絡先"</string>
     <string name="menu_sendTextMessage">"SMSメッセージを送信"</string>
     <string name="recentCalls_callNumber">"<xliff:g id="NAME">%s</xliff:g>さんに発信"</string>
-    <string name="recentCalls_editNumberBeforeCall">"番号を編集して発信"</string>
+    <string name="recentCalls_editNumberBeforeCall">"発信前に番号を編集"</string>
     <string name="recentCalls_addToContact">"連絡先に追加"</string>
-    <string name="recentCalls_removeFromRecentList">"通話ログを削除"</string>
-    <string name="recentCalls_deleteAll">"すべてのログをクリア"</string>
-    <string name="recentCalls_empty">"通話ログはありません。"</string>
+    <string name="recentCalls_removeFromRecentList">"通話履歴から消去"</string>
+    <string name="recentCalls_deleteAll">"通話履歴を全件消去"</string>
+    <string name="recentCalls_empty">"通話履歴なし"</string>
     <string name="imei">"IMEI"</string>
     <string name="voicemail">"ボイスメール"</string>
     <string name="unknown">"不明"</string>
     <string name="private_num">"非通知番号"</string>
-    <string name="dialerKeyboardHintText">"番号をキーボードから入力してください"</string>
+    <string name="dialerKeyboardHintText">"キーボードで番号を入力してください"</string>
     <string name="dialerDialpadHintText">"ダイヤルして通話を追加"</string>
-    <string name="simContacts_emptyLoading">"SIMカードからロードしています..."</string>
+    <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>
-    <string name="seclectSyncGroups_title">"同期を取るグループを選択"</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>
+    <string name="seclectSyncGroups_title">"同期するグループを選択"</string>
     <string name="liveFolder_all_label">"すべての連絡先"</string>
     <string name="liveFolder_favorites_label">"スター付き"</string>
     <string name="liveFolder_phones_label">"電話"</string>
     <string name="dialer_useDtmfDialpad">"プッシュホン式キーパッドを使う"</string>
     <string name="dialer_returnToInCallScreen">"保留中の通話に戻る"</string>
     <string name="dialer_addAnotherCall">"別の通話を追加"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"通話詳細"</string>
+    <string name="toast_call_detail_error">"通話要求の詳細が読み込めませんでした。"</string>
+    <string name="call_type">"入力"</string>
+    <string name="type_incoming">"通話着信"</string>
+    <string name="type_outgoing">"通話送信"</string>
+    <string name="type_missed">"不在着信"</string>
+    <string name="call_time">"時間"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"経過時間"</string>
+    <string name="header_actions">"操作"</string>
+    <string name="ringtone_spinner">"着信音: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"その他の項目を追加"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 0000000..d7ebcb6
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="contactsList">"연락처"</string>
+    <string name="shortcutContact">"연락처"</string>
+    <string name="starredList">"별표 표시된 연락처"</string>
+    <string name="frequentList">"자주 거는 전화"</string>
+    <string name="strequentList">"자주 거는 전화"</string>
+    <string name="viewContactTitle">"연락처 상세정보"</string>
+    <string name="viewContactDesription">"연락처 보기"</string>
+    <string name="editContactDescription">"연락처 편집"</string>
+    <string name="insertContactDescription">"연락처 만들기"</string>
+    <string name="searchHint">"연락처 검색"</string>
+    <string name="menu_newContact">"새 연락처"</string>
+    <string name="menu_viewContact">"연락처 보기"</string>
+    <string name="menu_callNumber">"<xliff:g id="NAME">%s</xliff:g>에게 전화걸기"</string>
+    <string name="menu_addStar">"즐겨찾기에 추가"</string>
+    <string name="menu_removeStar">"즐겨찾기에서 삭제"</string>
+    <string name="menu_showBarcode">"바코드 표시"</string>
+    <string name="menu_editContact">"연락처 편집"</string>
+    <string name="menu_deleteContact">"연락처 삭제"</string>
+    <string name="menu_call">"전화걸기"</string>
+    <string name="menu_sendSMS">"SMS/MMS 보내기"</string>
+    <string name="menu_sendEmail">"이메일 보내기"</string>
+    <string name="menu_viewAddress">"지도상의 주소"</string>
+    <string name="menu_makeDefaultNumber">"기본 번호로 설정"</string>
+    <string name="deleteConfirmation_title">"삭제"</string>
+    <string name="deleteConfirmation">"연락처가 삭제됩니다."</string>
+    <string name="menu_done">"완료"</string>
+    <string name="menu_doNotSave">"변경내용 취소"</string>
+    <string name="editContact_title_edit">"연락처 편집"</string>
+    <string name="editContact_title_insert">"새 연락처"</string>
+    <string name="menu_addItem">"추가정보"</string>
+    <string name="label_phonetic_name">"소리나는 대로"</string>
+    <string name="label_notes">"메모"</string>
+    <string name="label_ringtone">"벨소리"</string>
+    <string name="ghostData_name">"이름"</string>
+    <string name="ghostData_phonetic_name">"소리나는 대로의 이름"</string>
+    <string name="ghostData_company">"회사"</string>
+    <string name="ghostData_title">"직급"</string>
+    <string name="ghostData_im">"IM 이름"</string>
+    <string name="ghostData_notes">"내 메모"</string>
+    <string name="ghostData_phone">"전화번호"</string>
+    <string name="ghostData_email">"이메일 주소"</string>
+    <string name="ghostData_postal">"주소"</string>
+    <string name="invalidContactMessage">"연락처가 없습니다."</string>
+    <string name="pickerNewContactHeader">"새 연락처 만들기"</string>
+    <string name="selectLabel">"라벨 선택"</string>
+    <string name="phoneLabelsGroup">"전화"</string>
+    <string name="emailLabelsGroup">"이메일"</string>
+    <string name="imLabelsGroup">"IM"</string>
+    <string name="postalLabelsGroup">"주소"</string>
+    <string name="otherLabelsGroup">"기타"</string>
+  <string-array name="otherLabels">
+    <item>"조직"</item>
+    <item>"메모"</item>
+  </string-array>
+    <string name="errorDialogTitle">"사진 없음"</string>
+    <string name="photoPickerNotFoundText">"전화기에 사진이 없습니다."</string>
+    <string name="attachToContact">"연락처 아이콘"</string>
+    <string name="customLabelPickerTitle">"맞춤 라벨 이름"</string>
+    <string name="menu_displayGroup">"그룹 표시"</string>
+    <string name="syncGroupPreference">"동기화 그룹 편집"</string>
+    <string name="importFromSim">"연락처 가져오기"</string>
+    <string name="send_to_voicemail_checkbox">"음성메일에 직접 전화걸기"</string>
+    <string name="send_to_voicemail_view">"수신전화가 바로 음성메일로 연결됩니다."</string>
+    <string name="default_ringtone">"기본 벨소리"</string>
+    <string name="addPicture">"사진 추가"</string>
+    <string name="removePicture">"사진 제거"</string>
+    <string name="noContacts">"연락처가 없습니다."</string>
+    <string name="noContactsWithPhoneNumbers">"전화번호가 포함된 연락처가 없습니다."</string>
+    <string name="noFavorites">"자주 거는 전화가 없습니다."</string>
+    <string name="select_group_title">"그룹"</string>
+    <string name="groupEmpty">"\"<xliff:g id="GROUPNAME">%s</xliff:g>\" 그룹이 비었습니다."</string>
+    <string name="showAllGroups">"모든 연락처"</string>
+    <string name="syncAllGroups">"모든 연락처 동기화"</string>
+    <string name="groupNameMyContacts">"내 연락처"</string>
+    <string name="groupNameWithPhones">"전화번호가 포함된 연락처"</string>
+    <string name="contactCreatedToast">"연락처가 생성되었습니다."</string>
+    <string name="contactSavedToast">"연락처가 저장되었습니다."</string>
+    <string name="listSeparatorCallNumber">"전화번호"</string>
+    <string name="listSeparatorCallNumber_edit">"전화번호"</string>
+    <string name="listSeparatorSendSmsMms">"SMS/MMS 보내기"</string>
+    <string name="listSeparatorSendEmail">"이메일 보내기"</string>
+    <string name="listSeparatorSendEmail_edit">"이메일 주소"</string>
+    <string name="listSeparatorSendIm">"인스턴트 메시지 보내기"</string>
+    <string name="listSeparatorSendIm_edit">"인스턴트 메신저"</string>
+    <string name="listSeparatorMapAddress">"지도상의 주소"</string>
+    <string name="listSeparatorMapAddress_edit">"지도 주소"</string>
+    <string name="listSeparatorOrganizations">"조직"</string>
+    <string name="listSeparatorOtherInformation">"기타 정보"</string>
+    <string name="listSeparatorOtherInformation_edit">"기타 옵션"</string>
+    <string name="listSeparatorMore_edit">"더보기"</string>
+    <string name="contactsIconLabel">"연락처"</string>
+    <string name="contactsFavoritesLabel">"자주 거는 전화"</string>
+    <string name="dialerIconLabel">"전화걸기"</string>
+    <string name="recentCallsIconLabel">"통화기록"</string>
+    <string name="liveFolderAll">"전체 주소록"</string>
+    <string name="liveFolderFavorites">"별표 표시된 주소"</string>
+    <string name="liveFolderPhone">"전화번호 주소록"</string>
+    <string name="menu_sendTextMessage">"SMS 메시지 보내기"</string>
+    <string name="recentCalls_callNumber">"<xliff:g id="NAME">%s</xliff:g>에게 전화걸기"</string>
+    <string name="recentCalls_editNumberBeforeCall">"전화 걸기 전에 번호 편집"</string>
+    <string name="recentCalls_addToContact">"연락처에 추가"</string>
+    <string name="recentCalls_removeFromRecentList">"통화기록에서 제거"</string>
+    <string name="recentCalls_deleteAll">"통화기록 지우기"</string>
+    <string name="recentCalls_empty">"통화기록이 없습니다."</string>
+    <string name="imei">"IMEI"</string>
+    <string name="voicemail">"음성메일"</string>
+    <string name="unknown">"알 수 없음"</string>
+    <string name="private_num">"비공개 번호"</string>
+    <string name="dialerKeyboardHintText">"키보드를 사용하여 전화걸기"</string>
+    <string name="dialerDialpadHintText">"통화를 추가할 전화번호 입력"</string>
+    <string name="simContacts_emptyLoading">"SIM 카드에서 로드 중…"</string>
+    <string name="simContacts_title">"SIM 카드 연락처"</string>
+    <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Google 연락처를 동기화하세요."</font>" "\n"연락처를 전화기로 동기화하면 어디에서나 연락처를 확인할 수 있습니다."</string>
+    <string name="noContactsHelpText">"주소가 하나도 없습니다."\n\n"주소를 추가하려면 "<font fgcolor="#ffffffff"><b>"메뉴"</b></font>"를 누른 다음 다음을 선택하세요."\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"동기화 그룹 수정"</b></font>": 새 계정 또는 기존 Google 계정에서 추가"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"새 주소록"</b></font>": 처음부터 새 주소록 만들기"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"주소록 가져오기"</b></font>": SIM 카드에서 주소록 추가"\n</li></string>
+    <string name="seclectSyncGroups_title">"동기화할 그룹 선택"</string>
+    <string name="liveFolder_all_label">"전체 주소록"</string>
+    <string name="liveFolder_favorites_label">"중요편지함"</string>
+    <string name="liveFolder_phones_label">"전화번호"</string>
+    <string name="dialer_useDtmfDialpad">"터치톤 키패드 사용"</string>
+    <string name="dialer_returnToInCallScreen">"진행 중인 통화로 돌아가기"</string>
+    <string name="dialer_addAnotherCall">"통화 추가"</string>
+    <string name="callDetailTitle">"통화 세부정보"</string>
+    <string name="toast_call_detail_error">"요청한 통화의 세부정보를 볼 수 없습니다."</string>
+    <string name="call_type">"유형"</string>
+    <string name="type_incoming">"수신통화"</string>
+    <string name="type_outgoing">"발신통화"</string>
+    <string name="type_missed">"부재중 전화"</string>
+    <string name="call_time">"시간"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g>(<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"통화시간"</string>
+    <string name="header_actions">"작업"</string>
+    <string name="ringtone_spinner">"벨소리: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"항목 더 추가"</string>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100644
index 0000000..a5ee768
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns: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="shortcutContact">"Kontakt"</string>
+    <string name="starredList">"Med stjerne"</string>
+    <string name="frequentList">"Mest brukt"</string>
+    <string name="strequentList">"Favoritter"</string>
+    <string name="viewContactTitle">"Egenskaper for kontakt"</string>
+    <string name="viewContactDesription">"Se på kontakt"</string>
+    <string name="editContactDescription">"Rediger kontakt"</string>
+    <string name="insertContactDescription">"Opprett kontakt"</string>
+    <string name="searchHint">"Søk i kontakter"</string>
+    <string name="menu_newContact">"Ny kontakt"</string>
+    <string name="menu_viewContact">"Se på kontakt"</string>
+    <string name="menu_callNumber">"Ring <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="menu_addStar">"Legg til som favoritt"</string>
+    <string name="menu_removeStar">"Fjern fra favoritter"</string>
+    <string name="menu_showBarcode">"Vis strekkode"</string>
+    <string name="menu_editContact">"Rediger kontakt"</string>
+    <string name="menu_deleteContact">"Slett kontakt"</string>
+    <string name="menu_call">"Ring"</string>
+    <string name="menu_sendSMS">"Send SMS/MMS"</string>
+    <string name="menu_sendEmail">"Send e-post"</string>
+    <string name="menu_viewAddress">"Se i kart"</string>
+    <string name="menu_makeDefaultNumber">"Gjør til foretrukket nummer"</string>
+    <string name="deleteConfirmation_title">"Slett"</string>
+    <string name="deleteConfirmation">"Denne kontakten vil bli slettet."</string>
+    <string name="menu_done">"Lagre"</string>
+    <string name="menu_doNotSave">"Forkast endringer"</string>
+    <string name="editContact_title_edit">"Rediger kontakt"</string>
+    <string name="editContact_title_insert">"Ny kontakt"</string>
+    <string name="menu_addItem">"Mer informasjon"</string>
+    <string name="label_phonetic_name">"Fonetisk"</string>
+    <string name="label_notes">"Notater"</string>
+    <string name="label_ringtone">"Ringetone"</string>
+    <string name="ghostData_name">"For- og etternavn"</string>
+    <string name="ghostData_phonetic_name">"Fonetisk navn"</string>
+    <string name="ghostData_company">"Firma"</string>
+    <string name="ghostData_title">"Stilling"</string>
+    <string name="ghostData_im">"Lynmeldingsnavn"</string>
+    <string name="ghostData_notes">"Mine notater"</string>
+    <string name="ghostData_phone">"Telefonnummer"</string>
+    <string name="ghostData_email">"E-postadresse"</string>
+    <string name="ghostData_postal">"Postadresse"</string>
+    <string name="invalidContactMessage">"Kontakten finnes ikke."</string>
+    <string name="pickerNewContactHeader">"Opprett ny kontakt"</string>
+    <string name="selectLabel">"Velg etikett"</string>
+    <string name="phoneLabelsGroup">"Telefon"</string>
+    <string name="emailLabelsGroup">"E-post"</string>
+    <string name="imLabelsGroup">"Lynmeldinger"</string>
+    <string name="postalLabelsGroup">"Postadresse"</string>
+    <string name="otherLabelsGroup">"Annet"</string>
+  <string-array name="otherLabels">
+    <item>"Organisasjon"</item>
+    <item>"Notat"</item>
+  </string-array>
+    <string name="errorDialogTitle">"Ingen bilder"</string>
+    <string name="photoPickerNotFoundText">"Det er ingen bilder på telefonen."</string>
+    <string name="attachToContact">"Kontaktikon"</string>
+    <string name="customLabelPickerTitle">"Egendefinert etikett"</string>
+    <string name="menu_displayGroup">"Vis gruppe"</string>
+    <string name="syncGroupPreference">"Rediger synkroniserte grupper"</string>
+    <string name="importFromSim">"Importer kontakter"</string>
+    <string name="send_to_voicemail_checkbox">"Send anrop direkte til telefonsvarer."</string>
+    <string name="send_to_voicemail_view">"Anrop blir sendt direkte til telefonsvarer."</string>
+    <string name="default_ringtone">"Standardvalg"</string>
+    <string name="addPicture">"Legg til ikon"</string>
+    <string name="removePicture">"Fjern ikon"</string>
+    <string name="noContacts">"Ingen kontakter."</string>
+    <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="showAllGroups">"Alle kontakter"</string>
+    <string name="syncAllGroups">"Synkroniser alle kontakter"</string>
+    <string name="groupNameMyContacts">"Mine kontakter"</string>
+    <string name="groupNameWithPhones">"Kontakter med telefonnummer"</string>
+    <string name="contactCreatedToast">"Kontakt opprettet."</string>
+    <string name="contactSavedToast">"Kontakt lagret."</string>
+    <string name="listSeparatorCallNumber">"Ring nummer"</string>
+    <string name="listSeparatorCallNumber_edit">"Telefonnummer"</string>
+    <string name="listSeparatorSendSmsMms">"Send SMS/MMS"</string>
+    <string name="listSeparatorSendEmail">"Send e-post"</string>
+    <string name="listSeparatorSendEmail_edit">"E-postadresser"</string>
+    <string name="listSeparatorSendIm">"Send lynmelding"</string>
+    <!-- no translation found for listSeparatorSendIm_edit (3793290685553377986) -->
+    <skip />
+    <string name="listSeparatorMapAddress">"Se i kart"</string>
+    <!-- no translation found for listSeparatorMapAddress_edit (298711187672067985) -->
+    <skip />
+    <string name="listSeparatorOrganizations">"Organisasjoner"</string>
+    <string name="listSeparatorOtherInformation">"Annen informasjon"</string>
+    <string name="listSeparatorOtherInformation_edit">"Andre alternativer"</string>
+    <string name="listSeparatorMore_edit">"Mer"</string>
+    <string name="contactsIconLabel">"Alle"</string>
+    <string name="contactsFavoritesLabel">"Vanlige"</string>
+    <string name="dialerIconLabel">"Telefon"</string>
+    <string name="recentCallsIconLabel">"Logg"</string>
+    <string name="liveFolderAll">"Alle kontakter"</string>
+    <string name="liveFolderFavorites">"Kontakter med stjerne"</string>
+    <string name="liveFolderPhone">"Kontakter med telefonnummer"</string>
+    <string name="menu_sendTextMessage">"Send SMS-melding"</string>
+    <string name="recentCalls_callNumber">"Ring <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="recentCalls_editNumberBeforeCall">"Rediger nummer før anrop"</string>
+    <string name="recentCalls_addToContact">"Legg til kontakter"</string>
+    <string name="recentCalls_removeFromRecentList">"Fjern fra anropslogg"</string>
+    <string name="recentCalls_deleteAll">"Nullstill anropslogg"</string>
+    <string name="recentCalls_empty">"Anropsloggen er tom."</string>
+    <string name="imei">"IMEI"</string>
+    <string name="voicemail">"Telefonsvarer"</string>
+    <string name="unknown">"Ukjent"</string>
+    <string name="private_num">"Skjult nummer"</string>
+    <string name="dialerKeyboardHintText">"Bruk tastaturet for å ringe"</string>
+    <string name="dialerDialpadHintText">"Ring for å legge til en samtale"</string>
+    <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>
+    <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>
+    <string name="liveFolder_phones_label">"Telefoner"</string>
+    <string name="dialer_useDtmfDialpad">"Bruk tonetastatur"</string>
+    <string name="dialer_returnToInCallScreen">"Gå tilbake til pågående samtale"</string>
+    <string name="dialer_addAnotherCall">"Legg til en samtale"</string>
+    <string name="callDetailTitle">"Samtaleinformasjon"</string>
+    <string name="toast_call_detail_error">"Kunne ikke lese informasjon for forespurt samtale."</string>
+    <string name="call_type">"Type"</string>
+    <string name="type_incoming">"Innkommende samtale"</string>
+    <string name="type_outgoing">"Utgående samtale"</string>
+    <string name="type_missed">"Tapt anrop"</string>
+    <string name="call_time">"Tid"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Varighet"</string>
+    <string name="header_actions">"Handlinger"</string>
+    <string name="ringtone_spinner">"Ringetone: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Legg til flere elementer"</string>
+    <!-- no translation found for actionCall (695145166039381504) -->
+    <skip />
+    <!-- no translation found for actionEmail (3870371552333656807) -->
+    <skip />
+    <!-- no translation found for actionText (6399049224844880108) -->
+    <skip />
+    <!-- no translation found for actionChat (31079429748650300) -->
+    <skip />
+    <!-- no translation found for actionMap (1977955782051732775) -->
+    <skip />
+    <!-- no translation found for actionIncomingCall (6028930669817038600) -->
+    <skip />
+    <!-- no translation found for detailIncomingCallsGoToVoicemail (9163373178772231307) -->
+    <skip />
+    <!-- no translation found for detailsRingtone (4052108748982701775) -->
+    <skip />
+    <!-- no translation found for callBack (5498224409038809224) -->
+    <skip />
+</resources>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
deleted file mode 100644
index 09ce1bb..0000000
--- a/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="contactsList">"Contacten"</string>
-    <!-- no translation found for shortcutContact (1520089872483067797) -->
-    <skip />
-    <string name="starredList">"Met ster"</string>
-    <string name="frequentList">"Regelmatig"</string>
-    <string name="strequentList">"Favorieten"</string>
-    <!-- no translation found for viewContactTitle (5340316765801746261) -->
-    <skip />
-    <!-- no translation found for viewContactDesription (5593543465183236254) -->
-    <skip />
-    <!-- no translation found for editContactDescription (207393633337592309) -->
-    <skip />
-    <!-- no translation found for insertContactDescription (8392185611221432248) -->
-    <skip />
-    <string name="searchHint">"Contacten zoeken"</string>
-    <string name="menu_newContact">"Nieuw contact"</string>
-    <string name="menu_viewContact">"Contact weergeven"</string>
-    <!-- unknown placeholder CONTACT in menu_callNumber -->
-    <skip />
-    <string name="menu_addStar">"Ster toevoegen"</string>
-    <string name="menu_removeStar">"Ster verwijderen"</string>
-    <!-- no translation found for menu_showBarcode (4627916987700748636) -->
-    <skip />
-    <string name="menu_editContact">"Contact bewerken"</string>
-    <string name="menu_deleteContact">"Contact verwijderen"</string>
-    <string name="menu_call">"Bellen"</string>
-    <string name="menu_sendSMS">"Tekst verzenden"</string>
-    <string name="menu_sendEmail">"E-mail verzenden"</string>
-    <string name="menu_viewAddress">"Kaartadres"</string>
-    <string name="menu_makeDefaultNumber">"Standaardnummer maken"</string>
-    <!-- no translation found for deleteConfirmation_title (1628057421142368583) -->
-    <skip />
-    <string name="deleteConfirmation">"Deze contact verwijderen?"</string>
-    <string name="menu_done">"Opslaan"</string>
-    <string name="menu_doNotSave">"Wijzigingen negeren"</string>
-    <string name="button_save">"Opslaan"</string>
-    <string name="button_discard">"Wijzigingen negeren"</string>
-    <string name="editContact_title_edit">"Contact bewerken"</string>
-    <string name="editContact_title_insert">"Nieuw contact"</string>
-    <string name="menu_addItem">"Meer toevoegen"</string>
-    <string name="label_notes">"Opmerkingen"</string>
-    <!-- no translation found for label_ringtone (1269538172838343970) -->
-    <skip />
-    <string name="ghostData_name">"Eerste en laatste"</string>
-    <string name="ghostData_company">"Bedrijf"</string>
-    <string name="ghostData_title">"Positie"</string>
-    <string name="ghostData_im">"IM-naam"</string>
-    <string name="ghostData_notes">"Mijn opmerking"</string>
-    <string name="ghostData_phone">"Telefoonnummer"</string>
-    <string name="ghostData_email">"E-mailadres"</string>
-    <!-- unknown placeholder BREAK_0 in ghostData_postal -->
-    <skip />
-    <string name="invalidContactMessage">"Contacten moeten namen hebben"</string>
-    <string name="pickerNewContactHeader">"Nieuwe contact maken"</string>
-    <string name="selectLabel">"Label selecteren"</string>
-    <string name="phoneLabelsGroup">"Telefoon"</string>
-    <string name="emailLabelsGroup">"E-mail"</string>
-    <string name="imLabelsGroup">"Expresbericht"</string>
-    <string name="postalLabelsGroup">"Postadres"</string>
-    <string name="otherLabelsGroup">"Overig"</string>
-    <!-- no translation found for otherLabels:0 (3318569574569948132) -->
-    <!-- no translation found for otherLabels:1 (3325413568383685728) -->
-    <string name="errorDialogTitle">"Let op!"</string>
-    <string name="photoPickerNotFoundText">"Geen afbeeldingen beschikbaar."</string>
-    <string name="attachToContact">"Afbeelding contactpersoon "</string>
-    <string name="customLabelPickerTitle">"Aangepast label"</string>
-    <!-- no translation found for menu_displayGroup (2835746769742496686) -->
-    <skip />
-    <!-- no translation found for syncGroupPreference (759121296595419145) -->
-    <skip />
-    <string name="importFromSim">"Importeren van sim-kaart"</string>
-    <!-- no translation found for alphabet (4977128516779796464) -->
-    <skip />
-    <!-- no translation found for send_to_voicemail_checkbox (1699633783417579410) -->
-    <skip />
-    <!-- no translation found for send_to_voicemail_view (4299389800446371057) -->
-    <skip />
-    <!-- no translation found for default_ringtone (3998437793418131562) -->
-    <skip />
-    <!-- no translation found for addPicture (7010902051370875352) -->
-    <skip />
-    <!-- no translation found for removePicture (2322840177008417519) -->
-    <skip />
-    <!-- no translation found for noContacts (7515781671301309298) -->
-    <skip />
-    <!-- no translation found for noContactsWithPhoneNumbers (3105170743499016241) -->
-    <skip />
-    <!-- no translation found for noFavorites (7957536428532225634) -->
-    <skip />
-    <!-- no translation found for select_group_title (8821785850959403592) -->
-    <skip />
-    <!-- no translation found for groupEmpty (1733723844723885242) -->
-    <skip />
-    <!-- no translation found for showAllGroups (4524662887308889400) -->
-    <skip />
-    <!-- no translation found for syncAllGroups (8415112909188430211) -->
-    <skip />
-    <!-- no translation found for groupNameMyContacts (1298661863710879264) -->
-    <skip />
-    <!-- no translation found for groupNameWithPhones (4051877952712463294) -->
-    <skip />
-    <!-- no translation found for contactCreatedToast (5309869712901550955) -->
-    <skip />
-    <!-- no translation found for contactSavedToast (1228932477738680325) -->
-    <skip />
-    <!-- no translation found for listSeparatorCallNumber (9142725721395758026) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendSmsMms (8878062000446372333) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendEmail (3813935531061488274) -->
-    <skip />
-    <!-- no translation found for listSeparatorSendIm (3885045096980470847) -->
-    <skip />
-    <!-- no translation found for listSeparatorMapAddress (7749519405208811410) -->
-    <skip />
-    <!-- no translation found for listSeparatorOrganizations (5731454670822188295) -->
-    <skip />
-    <!-- no translation found for listSeparatorOtherInformation (3399084175925138065) -->
-    <skip />
-    <!-- no translation found for contactsIconLabel (392729648321810378) -->
-    <skip />
-    <!-- no translation found for contactsFavoritesLabel (6274307000699136596) -->
-    <skip />
-    <!-- no translation found for dialerIconLabel (396765298398417139) -->
-    <skip />
-    <!-- no translation found for recentCallsIconLabel (7432201162713288826) -->
-    <skip />
-    <!-- no translation found for liveFolderAll (5991510762804226223) -->
-    <skip />
-    <!-- no translation found for liveFolderFavorites (8755759874416875970) -->
-    <skip />
-    <!-- no translation found for liveFolderPhone (3440101264360244544) -->
-    <skip />
-    <!-- no translation found for menu_sendTextMessage (3055919380461974147) -->
-    <skip />
-    <!-- no translation found for recentCalls_callNumber (924407199258234369) -->
-    <skip />
-    <!-- no translation found for recentCalls_editNumberBeforeCall (7859145185424954030) -->
-    <skip />
-    <!-- no translation found for recentCalls_addToContact (6950267092567953305) -->
-    <skip />
-    <!-- no translation found for recentCalls_removeFromRecentList (5273789011391059975) -->
-    <skip />
-    <!-- no translation found for recentCalls_deleteAll (425798199678070888) -->
-    <skip />
-    <!-- no translation found for recentCalls_empty (7787624895504983911) -->
-    <skip />
-    <!-- no translation found for imei (1052536402066249452) -->
-    <skip />
-    <!-- no translation found for voicemail (1135686231023059817) -->
-    <skip />
-    <!-- no translation found for unknown (6231893925212017656) -->
-    <skip />
-    <!-- no translation found for private_num (3065614133902647350) -->
-    <skip />
-    <!-- no translation found for dialerKeyboardHintText (2013777173021862941) -->
-    <skip />
-    <!-- no translation found for simContacts_emptyLoading (4828419758306519589) -->
-    <skip />
-    <!-- no translation found for simContacts_title (4162577066960174009) -->
-    <skip />
-    <!-- no translation found for contactsSyncPlug (1549212649158409469) -->
-    <skip />
-    <!-- no translation found for noContactsHelpText (6155730972704522463) -->
-    <skip />
-    <!-- no translation found for seclectSyncGroups_title (7675331949118054911) -->
-    <skip />
-    <!-- no translation found for liveFolder_all_label (3716551598022430019) -->
-    <skip />
-    <!-- no translation found for liveFolder_favorites_label (9053985659909059395) -->
-    <skip />
-    <!-- no translation found for liveFolder_phones_label (8943901400107401868) -->
-    <skip />
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 041c8c9..b7f137b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"Als standaardnummer instellen"</string>
     <string name="deleteConfirmation_title">"Verwijderen"</string>
     <string name="deleteConfirmation">"Deze contactpersoon wordt verwijderd."</string>
-    <string name="menu_done">"Opslaan"</string>
+    <string name="menu_done">"Gereed"</string>
     <string name="menu_doNotSave">"Wijzigingen ongedaan maken"</string>
-    <string name="button_save">"Opslaan"</string>
-    <string name="button_discard">"Wijzigingen ongedaan maken"</string>
     <string name="editContact_title_edit">"Contactpersoon bewerken"</string>
     <string name="editContact_title_insert">"Nieuwe contactpersoon"</string>
     <string name="menu_addItem">"Meer informatie"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Fonetisch"</string>
     <string name="label_notes">"Opmerkingen"</string>
     <string name="label_ringtone">"Beltoon"</string>
     <string name="ghostData_name">"Voor- en achternaam"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Fonetisch gespelde naam"</string>
     <string name="ghostData_company">"Bedrijf"</string>
     <string name="ghostData_title">"Positie"</string>
     <string name="ghostData_im">"Chatnaam"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"Groep weergeven"</string>
     <string name="syncGroupPreference">"Gesynchroniseerde groepen bewerken"</string>
     <string name="importFromSim">"Contactpersonen importeren"</string>
-    <string name="send_to_voicemail_checkbox">"Oproepen rechtstreeks naar voicemail."</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>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Contactpersoon is gemaakt."</string>
     <string name="contactSavedToast">"Contactpersoon opgeslagen."</string>
     <string name="listSeparatorCallNumber">"Nummer bellen"</string>
+    <string name="listSeparatorCallNumber_edit">"Telefoonnummers"</string>
     <string name="listSeparatorSendSmsMms">"SMS/MMS verzenden"</string>
     <string name="listSeparatorSendEmail">"E-mail verzenden"</string>
+    <string name="listSeparatorSendEmail_edit">"E-mailadressen"</string>
     <string name="listSeparatorSendIm">"Chatbericht verzenden"</string>
+    <string name="listSeparatorSendIm_edit">"Instant messenger"</string>
     <string name="listSeparatorMapAddress">"Adres op kaart weergeven"</string>
+    <string name="listSeparatorMapAddress_edit">"Adres op kaart"</string>
     <string name="listSeparatorOrganizations">"Organisaties"</string>
     <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="contactsFavoritesLabel">"Favorieten"</string>
     <string name="dialerIconLabel">"Dialer"</string>
@@ -126,7 +128,7 @@
     <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">"U heeft geen contactpersonen."\n\n"Als u contactpersonen wilt toevoegen, drukt u op "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" en selecteert u:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Gesynchroniseerde groepen bewerken"</b></font>" als u contactpersonen vanuit een nieuwe of bestaande Google-account wilt toevoegen."\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nieuwe contactpersoon"</b></font>" als u een nieuwe contactpersoon wilt invoeren"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Contactpersonen importeren"</b></font>" als u contactpersonen wilt toevoegen vanaf uw SIM-kaart"\n</li></string>
+    <string name="noContactsHelpText">"Je hebt geen contactpersonen."\n\n"Als je contactpersonen wilt toevoegen, druk 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 deze toe te voegen van een nieuw of bestaand Google-account"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nieuwe contactpersoon"</b></font>" om een nieuwe contactpersoon te maken"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Contactpersonen importeren"</b></font>" om contactpersonen vanaf je SIM-kaart toe te voegen"\n</li></string>
     <string name="seclectSyncGroups_title">"Groepen selecteren om te synchroniseren"</string>
     <string name="liveFolder_all_label">"Alle contactpersonen"</string>
     <string name="liveFolder_favorites_label">"Met ster"</string>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Toetsen voor toonkiezen gebruiken"</string>
     <string name="dialer_returnToInCallScreen">"Terug naar actief gesprek"</string>
     <string name="dialer_addAnotherCall">"Oproep toevoegen"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"Gespreksgegevens"</string>
+    <string name="toast_call_detail_error">"Kan geen gegevens over het gevraagde gesprek vinden."</string>
+    <string name="call_type">"Type"</string>
+    <string name="type_incoming">"Binnenkomende oproep"</string>
+    <string name="type_outgoing">"Uitgaand gesprek"</string>
+    <string name="type_missed">"Oproep gemist"</string>
+    <string name="call_time">"Tijd"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Duur"</string>
+    <string name="header_actions">"Acties"</string>
+    <string name="ringtone_spinner">"Beltoon: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Meer items toevoegen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5917a28..ca5790d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"Ustaw ten numer jako domyślny"</string>
     <string name="deleteConfirmation_title">"Usuń"</string>
     <string name="deleteConfirmation">"Ten kontakt zostanie usunięty."</string>
-    <string name="menu_done">"Zapisz"</string>
+    <string name="menu_done">"Gotowe"</string>
     <string name="menu_doNotSave">"Odrzuć zmiany"</string>
-    <string name="button_save">"Zapisz"</string>
-    <string name="button_discard">"Odrzuć zmiany"</string>
     <string name="editContact_title_edit">"Edytuj kontakt"</string>
     <string name="editContact_title_insert">"Nowy kontakt"</string>
     <string name="menu_addItem">"Więcej informacji"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Fonetycznie"</string>
     <string name="label_notes">"Notatki"</string>
     <string name="label_ringtone">"Dzwonek"</string>
     <string name="ghostData_name">"Imię i nazwisko"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Nazwisko (fonetycznie)"</string>
     <string name="ghostData_company">"Firma"</string>
     <string name="ghostData_title">"Pozycja"</string>
     <string name="ghostData_im">"Nazwa w komunikatorze"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"Wyświetl grupę"</string>
     <string name="syncGroupPreference">"Edytuj grupy synchronizacji"</string>
     <string name="importFromSim">"Importuj kontakty"</string>
-    <string name="send_to_voicemail_checkbox">"Kieruj połączenia bezpośrednio do poczty głosowej."</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>
     <string name="default_ringtone">"Domyślny"</string>
     <string name="addPicture">"Dodaj ikonę"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Utworzono kontakt."</string>
     <string name="contactSavedToast">"Kontakt został zapisany."</string>
     <string name="listSeparatorCallNumber">"Wybierz numer"</string>
+    <string name="listSeparatorCallNumber_edit">"Numery telefonów"</string>
     <string name="listSeparatorSendSmsMms">"Wyślij wiadomość SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"Wyślij wiadomość e-mail"</string>
+    <string name="listSeparatorSendEmail_edit">"Adresy e-mail"</string>
     <string name="listSeparatorSendIm">"Wyślij wiadomość błyskawiczną"</string>
+    <string name="listSeparatorSendIm_edit">"Komunikator internetowy"</string>
     <string name="listSeparatorMapAddress">"Pokaż adres na mapie"</string>
+    <string name="listSeparatorMapAddress_edit">"Adres na mapie"</string>
     <string name="listSeparatorOrganizations">"Organizacje"</string>
     <string name="listSeparatorOtherInformation">"Inne informacje"</string>
+    <string name="listSeparatorOtherInformation_edit">"Inne opcje"</string>
+    <string name="listSeparatorMore_edit">"Więcej"</string>
     <string name="contactsIconLabel">"Kontakty"</string>
     <string name="contactsFavoritesLabel">"Ulubione"</string>
     <string name="dialerIconLabel">"Klawisze"</string>
@@ -126,7 +128,7 @@
     <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 kontaktów."\n\n"Aby dodać kontakty, naciśnij przycisk "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" i wybierz jedną z opcji:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Edytuj grupy synchronizacji"</b></font>", aby dodać kontakty z nowego lub istniejącego konta Google;"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Nowy kontakt"</b></font>", aby utworzyć nowy kontakt od podstaw;"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Importuj kontakty"</b></font>", aby dodać kontakty z karty SIM."\n</li></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>
     <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>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"Użyj klawiatury tonowej"</string>
     <string name="dialer_returnToInCallScreen">"Powrót do aktywnego połączenia"</string>
     <string name="dialer_addAnotherCall">"Dodaj połączenie"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <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_outgoing">"Połączenie wychodzące"</string>
+    <string name="type_missed">"Nieodebrane połączenia"</string>
+    <string name="call_time">"Godzina"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Czas trwania"</string>
+    <string name="header_actions">"Czynności"</string>
+    <string name="ringtone_spinner">"Dźwięk dzwonka: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Dodaj więcej elementów"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b45528b..c1f3310 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,7 +28,7 @@
     <string name="menu_newContact">"Создать контакт"</string>
     <string name="menu_viewContact">"Просмотреть контакт"</string>
     <string name="menu_callNumber">"Позвонить: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_addStar">"Добавить к избранному"</string>
+    <string name="menu_addStar">"Добавить в избранное"</string>
     <string name="menu_removeStar">"Удалить из избранного"</string>
     <string name="menu_showBarcode">"Показать штрихкод"</string>
     <string name="menu_editContact">"Изменить контакт"</string>
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"Сделать номером по умолчанию"</string>
     <string name="deleteConfirmation_title">"Удаление"</string>
     <string name="deleteConfirmation">"Этот контакт будет удален."</string>
-    <string name="menu_done">"Сохранить"</string>
+    <string name="menu_done">"Готово"</string>
     <string name="menu_doNotSave">"Отменить изменения"</string>
-    <string name="button_save">"Сохранить"</string>
-    <string name="button_discard">"Отменить изменения"</string>
     <string name="editContact_title_edit">"Изменить контакт"</string>
     <string name="editContact_title_insert">"Создание контакта"</string>
     <string name="menu_addItem">"Подробнее"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"Фонетика"</string>
     <string name="label_notes">"Примечания"</string>
     <string name="label_ringtone">"Мелодия звонка"</string>
     <string name="ghostData_name">"Первый и последний"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"Имя (фонетическая запись)"</string>
     <string name="ghostData_company">"Компания"</string>
     <string name="ghostData_title">"Должность"</string>
     <string name="ghostData_im">"Имя в чате"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"Показать группу"</string>
     <string name="syncGroupPreference">"Изменить группы синхронизации"</string>
     <string name="importFromSim">"Импортировать контакты"</string>
-    <string name="send_to_voicemail_checkbox">"Направлять вызовы прямо в голосовую почту."</string>
+    <string name="send_to_voicemail_checkbox">"Направлять звонки в голосовую почту"</string>
     <string name="send_to_voicemail_view">"Вызовы направляются прямо в голосовую почту."</string>
     <string name="default_ringtone">"По умолчанию"</string>
     <string name="addPicture">"Добавить значок"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"Контакт создан."</string>
     <string name="contactSavedToast">"Контакт сохранен."</string>
     <string name="listSeparatorCallNumber">"Набрать номер"</string>
+    <string name="listSeparatorCallNumber_edit">"Номера телефонов"</string>
     <string name="listSeparatorSendSmsMms">"Отправить SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"Отправить сообщение электронной почты"</string>
+    <string name="listSeparatorSendEmail_edit">"Адреса электронной почты"</string>
     <string name="listSeparatorSendIm">"Отправить мгновенное сообщение"</string>
+    <string name="listSeparatorSendIm_edit">"Instant messenger"</string>
     <string name="listSeparatorMapAddress">"Адрес на карте"</string>
+    <string name="listSeparatorMapAddress_edit">"Адрес на карте"</string>
     <string name="listSeparatorOrganizations">"Организации"</string>
     <string name="listSeparatorOtherInformation">"Другие сведения"</string>
+    <string name="listSeparatorOtherInformation_edit">"Другие параметры"</string>
+    <string name="listSeparatorMore_edit">"Дополнительно"</string>
     <string name="contactsIconLabel">"Контакты"</string>
     <string name="contactsFavoritesLabel">"Избранные"</string>
     <string name="dialerIconLabel">"Набор номеров"</string>
@@ -122,36 +124,28 @@
     <string name="unknown">"Неизвестно"</string>
     <string name="private_num">"Частный номер"</string>
     <string name="dialerKeyboardHintText">"Для набора воспользуйтесь клавиатурой"</string>
-    <string name="dialerDialpadHintText">"Наберите номер для добавления вызова"</string>
+    <string name="dialerDialpadHintText">"Наберите номер, чтобы добавить вызов"</string>
     <string name="simContacts_emptyLoading">"Идет загрузка с SIM-карты…"</string>
     <string name="simContacts_title">"Контакты на SIM-карте"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Синхронизируйте свои контакты Google!"</font>" "\n"После синхронизации с телефоном вы сможете общаться со знакомыми, где бы вы ни были."</string>
-    <string name="noContactsHelpText">"У вас пока нет контактов."\n\n"Чтобы добавить контакты, нажмите кнопку "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" и выберите:"\n\n"        "\n<li><font fgcolor="#ffffffff"><b>"Изменить группы синхронизации"</b></font>" для добавления из нового или существующего аккаунта Google"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Создать контакт"</b></font>" для создания контакта с нуля"\n</li>\n"        "\n<li><font fgcolor="#ffffffff"><b>"Импортировать контакты"</b></font>" для добавления контактов с SIM-карты"\n</li></string>
+    <string name="noContactsHelpText">"Контакты отсутствуют."\n\n"Чтобы добавить контакты, нажмите кнопку "<font fgcolor="#ffffffff"><b>"\"Меню\""</b></font>", и выберите пункт "\n\n\n<li><font fgcolor="#ffffffff"><b>"\"Редактировать группы синхронизации\""</b></font>" для добавления контакта из нового или существующего аккаунта Google, "\n</li>\n\n<li><font fgcolor="#ffffffff"><b>"\"Создать контакт\""</b></font>" для создания нового контакта из рабочей области или"\n</li>\n\n<li><font fgcolor="#ffffffff"><b>"\"Импортировать контакты\""</b></font>" для добавления контактов, содержащихся на SIM-карте"\n</li>"."</string>
     <string name="seclectSyncGroups_title">"Выбор групп для синхронизации"</string>
     <string name="liveFolder_all_label">"Все контакты"</string>
     <string name="liveFolder_favorites_label">"Помеченные"</string>
     <string name="liveFolder_phones_label">"Телефоны"</string>
     <string name="dialer_useDtmfDialpad">"Использовать клавиатуру тонального набора"</string>
-    <string name="dialer_returnToInCallScreen">"Отобразить текущий вызов"</string>
-    <string name="dialer_addAnotherCall">"Добавить вызов"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="dialer_returnToInCallScreen">"Вернуться к текущему звонку"</string>
+    <string name="dialer_addAnotherCall">"Добавить звонок"</string>
+    <string name="callDetailTitle">"Сведения о звонке"</string>
+    <string name="toast_call_detail_error">"Не удается считать сведения об указанном звонке."</string>
+    <string name="call_type">"Тип"</string>
+    <string name="type_incoming">"Входящий звонок"</string>
+    <string name="type_outgoing">"Исходящий звонок"</string>
+    <string name="type_missed">"Пропущенный звонок"</string>
+    <string name="call_time">"Время"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"Продолжительность"</string>
+    <string name="header_actions">"Действия"</string>
+    <string name="ringtone_spinner">"Мелодия: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"Добавление контактов"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c787c16..368e074 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"设置默认号码"</string>
     <string name="deleteConfirmation_title">"删除"</string>
     <string name="deleteConfirmation">"会删除此联系人。"</string>
-    <string name="menu_done">"保存"</string>
+    <string name="menu_done">"完成"</string>
     <string name="menu_doNotSave">"放弃更改"</string>
-    <string name="button_save">"保存"</string>
-    <string name="button_discard">"放弃更改"</string>
     <string name="editContact_title_edit">"编辑联系人"</string>
     <string name="editContact_title_insert">"添加联系人"</string>
     <string name="menu_addItem">"详细信息"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"拼音"</string>
     <string name="label_notes">"备注"</string>
     <string name="label_ringtone">"铃声"</string>
     <string name="ghostData_name">"第一个和最后一个"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"拼音姓名"</string>
     <string name="ghostData_company">"公司"</string>
     <string name="ghostData_title">"位置"</string>
     <string name="ghostData_im">"即时消息名称"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"显示组"</string>
     <string name="syncGroupPreference">"编辑同步组"</string>
     <string name="importFromSim">"导入联系人"</string>
-    <string name="send_to_voicemail_checkbox">"直接呼叫语音信箱。"</string>
+    <string name="send_to_voicemail_checkbox">"将通话直接发送到语音邮件"</string>
     <string name="send_to_voicemail_view">"呼叫被直接发送至语音邮件。"</string>
     <string name="default_ringtone">"默认"</string>
     <string name="addPicture">"“添加”图标"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"已创建“联系人”。"</string>
     <string name="contactSavedToast">"已保存联系人。"</string>
     <string name="listSeparatorCallNumber">"拔号"</string>
+    <string name="listSeparatorCallNumber_edit">"电话号码"</string>
     <string name="listSeparatorSendSmsMms">"发送短信/彩信"</string>
     <string name="listSeparatorSendEmail">"发送电子邮件"</string>
+    <string name="listSeparatorSendEmail_edit">"电子邮件地址"</string>
     <string name="listSeparatorSendIm">"发送即时消息"</string>
+    <string name="listSeparatorSendIm_edit">"即时通讯软件"</string>
     <string name="listSeparatorMapAddress">"地图地址"</string>
+    <string name="listSeparatorMapAddress_edit">"地图地址"</string>
     <string name="listSeparatorOrganizations">"组织"</string>
     <string name="listSeparatorOtherInformation">"其他信息"</string>
+    <string name="listSeparatorOtherInformation_edit">"其他选项"</string>
+    <string name="listSeparatorMore_edit">"更多"</string>
     <string name="contactsIconLabel">"联系人"</string>
     <string name="contactsFavoritesLabel">"收藏夹"</string>
     <string name="dialerIconLabel">"拔号程序"</string>
@@ -126,7 +128,7 @@
     <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>
+    <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>
     <string name="seclectSyncGroups_title">"选择要同步的组"</string>
     <string name="liveFolder_all_label">"所有联系人"</string>
     <string name="liveFolder_favorites_label">"已加星标"</string>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"使用按键式键盘"</string>
     <string name="dialer_returnToInCallScreen">"返回到正在进行中的通话"</string>
     <string name="dialer_addAnotherCall">"添加通话"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"通话详情"</string>
+    <string name="toast_call_detail_error">"无法阅读所请求通话的详情。"</string>
+    <string name="call_type">"类型"</string>
+    <string name="type_incoming">"来电"</string>
+    <string name="type_outgoing">"去电"</string>
+    <string name="type_missed">"未接来电"</string>
+    <string name="call_time">"时间"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g>（<xliff:g id="RELATIVE">%2$s</xliff:g>）"</string>
+    <string name="call_duration">"持续时间"</string>
+    <string name="header_actions">"操作"</string>
+    <string name="ringtone_spinner">"铃声：<xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"添加更多项目"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c3f55e9..b011f19 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -40,20 +40,16 @@
     <string name="menu_makeDefaultNumber">"設為預設號碼"</string>
     <string name="deleteConfirmation_title">"刪除"</string>
     <string name="deleteConfirmation">"此連絡人會被刪除。"</string>
-    <string name="menu_done">"儲存"</string>
+    <string name="menu_done">"完成"</string>
     <string name="menu_doNotSave">"放棄變更"</string>
-    <string name="button_save">"儲存"</string>
-    <string name="button_discard">"放棄變更"</string>
     <string name="editContact_title_edit">"編輯連絡人"</string>
     <string name="editContact_title_insert">"新增連絡人"</string>
     <string name="menu_addItem">"更多資訊"</string>
-    <!-- no translation found for label_phonetic_name (2288082649573927286) -->
-    <skip />
+    <string name="label_phonetic_name">"拼音"</string>
     <string name="label_notes">"附註"</string>
     <string name="label_ringtone">"鈴聲"</string>
     <string name="ghostData_name">"姓名"</string>
-    <!-- no translation found for ghostData_phonetic_name (7852749081984070902) -->
-    <skip />
+    <string name="ghostData_phonetic_name">"姓名拼音"</string>
     <string name="ghostData_company">"公司"</string>
     <string name="ghostData_title">"職位"</string>
     <string name="ghostData_im">"即時訊息帳號"</string>
@@ -80,7 +76,7 @@
     <string name="menu_displayGroup">"顯示群組"</string>
     <string name="syncGroupPreference">"編輯同步處理群組"</string>
     <string name="importFromSim">"匯入連絡人"</string>
-    <string name="send_to_voicemail_checkbox">"將通話直接轉至語音信箱"</string>
+    <string name="send_to_voicemail_checkbox">"直接將通話轉到語音郵件"</string>
     <string name="send_to_voicemail_view">"通話已直接轉至語音信箱"</string>
     <string name="default_ringtone">"預設值"</string>
     <string name="addPicture">"新增圖示"</string>
@@ -97,12 +93,18 @@
     <string name="contactCreatedToast">"已建立連絡人"</string>
     <string name="contactSavedToast">"連絡人已儲存。"</string>
     <string name="listSeparatorCallNumber">"撥打號碼"</string>
+    <string name="listSeparatorCallNumber_edit">"電話號碼"</string>
     <string name="listSeparatorSendSmsMms">"傳送  SMS/MMS"</string>
     <string name="listSeparatorSendEmail">"傳送電子郵件"</string>
+    <string name="listSeparatorSendEmail_edit">"電子郵件地址"</string>
     <string name="listSeparatorSendIm">"傳送即時訊息"</string>
+    <string name="listSeparatorSendIm_edit">"即時通訊程式"</string>
     <string name="listSeparatorMapAddress">"在地圖上顯示地址"</string>
+    <string name="listSeparatorMapAddress_edit">"以地圖顯示地址"</string>
     <string name="listSeparatorOrganizations">"組織"</string>
     <string name="listSeparatorOtherInformation">"其他資訊"</string>
+    <string name="listSeparatorOtherInformation_edit">"其他選項"</string>
+    <string name="listSeparatorMore_edit">"更多"</string>
     <string name="contactsIconLabel">"連絡人"</string>
     <string name="contactsFavoritesLabel">"我的最愛"</string>
     <string name="dialerIconLabel">"撥號"</string>
@@ -126,7 +128,7 @@
     <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>
+    <string name="noContactsHelpText">"您沒有聯絡人。"\n\n"如要新增聯絡人，請按 ["<font fgcolor="#ffffffff"><b>"選單"</b></font>"] 鍵並選取下列選項："\n\n"        "\n"["<li><font fgcolor="#ffffffff"><b>"編輯同步群組"</b></font>"]：加入新的或既有的 Google 帳戶聯絡人"\n</li>\n"        "\n"["<li><font fgcolor="#ffffffff"><b>"新聯絡人"</b></font>"]：建立新聯絡人"\n</li>\n"        "\n"["<li><font fgcolor="#ffffffff"><b>"匯入聯絡人"</b></font>"]：加入 SIM 卡中的聯絡人"\n</li></string>
     <string name="seclectSyncGroups_title">"選取要同步處理的群組"</string>
     <string name="liveFolder_all_label">"全部聯絡人"</string>
     <string name="liveFolder_favorites_label">"星號標記"</string>
@@ -134,24 +136,16 @@
     <string name="dialer_useDtmfDialpad">"使用按鍵式鍵盤"</string>
     <string name="dialer_returnToInCallScreen">"返回進行中的通話"</string>
     <string name="dialer_addAnotherCall">"新增通話"</string>
-    <!-- no translation found for callDetailTitle (5340227785196217938) -->
-    <skip />
-    <!-- no translation found for toast_call_detail_error (7200975244804730096) -->
-    <skip />
-    <!-- no translation found for call_type (3213526349444862087) -->
-    <skip />
-    <!-- no translation found for type_incoming (6502076603836088532) -->
-    <skip />
-    <!-- no translation found for type_outgoing (343108709599392641) -->
-    <skip />
-    <!-- no translation found for type_missed (2720502601640509542) -->
-    <skip />
-    <!-- no translation found for call_time (5805575214626630975) -->
-    <skip />
-    <!-- no translation found for datetime_relative (2906207446040994658) -->
-    <skip />
-    <!-- no translation found for call_duration (3941950339482985532) -->
-    <skip />
-    <!-- no translation found for header_actions (229583643365836321) -->
-    <skip />
+    <string name="callDetailTitle">"通話詳細資料"</string>
+    <string name="toast_call_detail_error">"無法解讀通話要求詳細資訊。"</string>
+    <string name="call_type">"類型"</string>
+    <string name="type_incoming">"外來通話"</string>
+    <string name="type_outgoing">"播出通話"</string>
+    <string name="type_missed">"未接通話"</string>
+    <string name="call_time">"時間"</string>
+    <string name="datetime_relative">"<xliff:g id="DATETIME">%1$s</xliff:g> (<xliff:g id="RELATIVE">%2$s</xliff:g>)"</string>
+    <string name="call_duration">"持續時間"</string>
+    <string name="header_actions">"動作"</string>
+    <string name="ringtone_spinner">"鈴聲：<xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
+    <string name="add_more_items">"新增更多項目"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b98ee50..bd09510 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,7 +15,8 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Title for the activity that shows contacts -->
+    <!-- Title for the activity that shows contacts.  This is the name
+         used in the Launcher icon. -->
     <string name="contactsList">Contacts</string>
 
     <!-- Name of activity that allows users to create shortcuts on the home screen to a contact.
@@ -97,17 +98,11 @@
     <string name="deleteConfirmation">This contact will be deleted.</string>
 
     <!-- Menu item to indicate you are done editing a contact and want to save the changes you've made -->
-    <string name="menu_done">Save</string>
+    <string name="menu_done">Done</string>
 
     <!-- Menu item to indicate you want to stop editing a contact and NOT save the changes you've made -->
     <string name="menu_doNotSave">Discard changes</string>
 
-    <!-- Button to indicate you are done editing a contact and want to save the changes you've made -->
-    <string name="button_save">Save</string>
-
-    <!-- Button to indicate you want to stop editing a contact and NOT save the changes you've made -->
-    <string name="button_discard">Discard changes</string>
-
     <!-- The title of the activity that edits and existing contact -->
     <string name="editContact_title_edit">Edit contact</string>
 
@@ -212,7 +207,7 @@
     <string name="importFromSim">Import contacts</string>
 
     <!-- Check box label that allows calls to the contact to be sent directly to voicemail -->
-    <string name="send_to_voicemail_checkbox">Send calls directly to voicemail.</string>
+    <string name="send_to_voicemail_checkbox">Send calls directly to voicemail</string>
 
     <!-- String letting the user know that calls from the contact they're viewing will be sent directly to voicemail -->
     <string name="send_to_voicemail_view">Calls are sent directly to voicemail.</string>
@@ -262,25 +257,43 @@
 
     <!-- Separator in the contact details list describing that the items below it will place a call when clicked -->
     <string name="listSeparatorCallNumber">Dial number</string>
-    
+
+    <!-- Section header in the Edit Contacts screen for phone numbers -->
+    <string name="listSeparatorCallNumber_edit">Phone numbers</string>
+
     <!-- Separator in the contact details list describing that the items below it will send an SMS/MMS to a phone number -->
     <string name="listSeparatorSendSmsMms">Send SMS/MMS</string>
 
     <!-- Separator in the contact details list describing that the items below it will send an email -->
     <string name="listSeparatorSendEmail">Send email</string>
 
+    <!-- Section header in the Edit Contacts screen for E-mail addresses -->
+    <string name="listSeparatorSendEmail_edit">Email addresses</string>
+
     <!-- Separator in the contact details list describing that the items below it will send an IM -->
     <string name="listSeparatorSendIm">Send instant message</string>
 
+    <!-- Section header in the Edit Contacts screen for Instant messanger accounts -->
+    <string name="listSeparatorSendIm_edit">Chat addresses</string>
+
     <!-- Separator in the contact details list describing that the items below it will open maps with the given address -->
     <string name="listSeparatorMapAddress">Map address</string>
 
+    <!-- Section header in the Edit Contacts screen for map addresses -->
+    <string name="listSeparatorMapAddress_edit">Postal addresses</string>
+
     <!-- Separator in the contact details list describing that the items below are non-actionable organization information -->
     <string name="listSeparatorOrganizations">Organizations</string>
 
     <!-- Separator in the contact details list describing that the items below are random other non-actionable information about a contact -->
     <string name="listSeparatorOtherInformation">Other information</string>
 
+    <!-- Section header in the Edit Contacts screen for other options, such as setting ringtone -->
+    <string name="listSeparatorOtherInformation_edit">Other options</string>
+
+    <!-- Section header in the Edit Contacts screen for the "Add more items" button -->
+    <string name="listSeparatorMore_edit">More</string>
+
     <!-- The description text for the contacts tab. Space is limited for this string, so the shorter the better -->
     <string name="contactsIconLabel">Contacts</string>
 
@@ -392,9 +405,13 @@
     <!-- In call detail screen, label for call type -->
     <string name="call_type">Type</string>
 
-    <!-- In call detail screen, expanded titles for call types -->
+    <!-- Title for incoming call details screen -->
     <string name="type_incoming">Incoming call</string>
+    
+    <!-- Title for outgoing call details screen -->
     <string name="type_outgoing">Outgoing call</string>
+
+    <!-- Title for missed call details screen -->
     <string name="type_missed">Missed call</string>
 
     <!-- In call detail screen, label for call date/time -->
@@ -409,4 +426,36 @@
     <!-- In call detail screen, header title for actions section -->
     <string name="header_actions">Actions</string>
 
+    <!-- In edit contact screen, combine the actual ringtone name with prefix for placement in spinner -->
+    <string name="ringtone_spinner">"Ringtone: <xliff:g id="ringtone" example="Caribbean Ice">%1$s</xliff:g>"</string>
+
+    <!-- In edit contact screen, add more info spinner title -->
+    <string name="add_more_items">Add more items</string>
+
+    <!-- Action string for calling a phone number. -->
+    <string name="actionCall">Call <xliff:g id="type" example="mobile">%s</xliff:g></string>
+
+    <!-- Action string for sending an email to an email address. -->
+    <string name="actionEmail">Email <xliff:g id="type" example="home">%s</xliff:g></string>
+
+    <!-- Action string for sending a text message to a phone number. -->
+    <string name="actionText">Text <xliff:g id="type" example="mobile">%s</xliff:g></string>
+
+    <!-- Action string for sending an instant message to a chat buddy. -->
+    <string name="actionChat">Chat using <xliff:g id="type" example="Google Talk">%s</xliff:g></string>
+
+    <!-- Action string for viewing an address on a map. -->
+    <string name="actionMap">View <xliff:g id="type" example="home">%s</xliff:g> address</string>
+
+    <!-- Description for incoming calls going to voice mail vs. not -->
+    <string name="actionIncomingCall">Incoming calls</string>
+    
+    <!-- Detail text for incoming calls going to voice mail -->
+    <string name="detailIncomingCallsGoToVoicemail">Will be sent directly to voicemail</string>
+
+    <!-- Description of what the contact specific ringtone is set to -->
+    <string name="detailsRingtone">Set to <xliff:g id="ringtone_name" example="Flutey Phone">%s</xliff:g></string>
+    
+    <!-- Action string for calling back a number in the call log -->
+    <string name="callBack">Call back</string>
 </resources>
diff --git a/src/com/android/contacts/ContactsGroupSyncSelector.java b/src/com/android/contacts/ContactsGroupSyncSelector.java
index 6081c79..80b5166 100644
--- a/src/com/android/contacts/ContactsGroupSyncSelector.java
+++ b/src/com/android/contacts/ContactsGroupSyncSelector.java
@@ -112,6 +112,12 @@
             }
             
             case R.id.ok: {
+                // The list isn't setup yet, so just return without doing anything.
+                if (mChecked == null) {
+                    finish();
+                    return;
+                }
+
                 final ContentResolver resolver = getContentResolver();
                 if (mSyncAllGroups) {
                     // For now we only support a single account and the UI doesn't know what
diff --git a/src/com/android/contacts/DialtactsActivity.java b/src/com/android/contacts/DialtactsActivity.java
index 1933c4c..d3f8981 100644
--- a/src/com/android/contacts/DialtactsActivity.java
+++ b/src/com/android/contacts/DialtactsActivity.java
@@ -176,6 +176,14 @@
             finish();
             return;
         }
+        
+        // Dismiss menu provided by any children activites
+        Activity activity = getLocalActivityManager().
+                getActivity(mTabHost.getCurrentTabTag());
+        if (activity != null) {
+            activity.closeOptionsMenu();
+        }
+
         intent.putExtra(EXTRA_IGNORE_STATE, true);
         if (intent.getComponent().getClassName().equals(getClass().getName())) {
             if (recentCallsRequest) {
diff --git a/src/com/android/contacts/EditContactActivity.java b/src/com/android/contacts/EditContactActivity.java
index fb8dd70..d34713d 100644
--- a/src/com/android/contacts/EditContactActivity.java
+++ b/src/com/android/contacts/EditContactActivity.java
@@ -170,7 +170,6 @@
     
     private EditText mNameView;
     private ImageView mPhotoImageView;
-    private View mPhotoButton;
     private CheckBox mSendToVoicemailCheckBox;
     private LinearLayout mLayout;
     private LayoutInflater mInflater;
@@ -198,7 +197,6 @@
 
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.photoButton:
             case R.id.photoImage: {
                 doPickPhotoAction();
                 break;
@@ -252,9 +250,17 @@
     }
 
     private void setPhotoPresent(boolean present) {
-        mPhotoImageView.setVisibility(present ? View.VISIBLE : View.GONE);
-        mPhotoButton.setVisibility(present ? View.GONE : View.VISIBLE);
         mPhotoPresent = present;
+        
+        // Correctly scale the contact photo if present, otherwise just center
+        // the photo placeholder icon.
+        if (mPhotoPresent) {
+            mPhotoImageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        } else {
+            mPhotoImageView.setImageResource(R.drawable.ic_menu_add_picture);
+            mPhotoImageView.setScaleType(ImageView.ScaleType.CENTER);
+        }
+        
         if (mPhotoMenuItem != null) {
             if (present) {
                 mPhotoMenuItem.setTitle(R.string.removePicture);
@@ -312,9 +318,6 @@
         mNameView = (EditText) findViewById(R.id.name);
         mPhotoImageView = (ImageView) findViewById(R.id.photoImage);
         mPhotoImageView.setOnClickListener(this);
-        mPhotoImageView.setVisibility(View.GONE);
-        mPhotoButton = findViewById(R.id.photoButton);
-        mPhotoButton.setOnClickListener(this);
         mSendToVoicemailCheckBox = (CheckBox) findViewById(R.id.send_to_voicemail);
         mPhoneticNameView = (EditText) findViewById(R.id.phonetic_name);
 
@@ -340,6 +343,7 @@
                     buildEntriesForEdit(getIntent().getExtras());
                     buildViews();
                 }
+                setTitle(R.string.editContact_title_edit);
                 mState = STATE_EDIT;
             } else if (action.equals(Intent.ACTION_INSERT)) {
                 if (icicle == null) {
@@ -347,6 +351,7 @@
                     buildEntriesForInsert(getIntent().getExtras());
                     buildViews();
                 }
+                setTitle(R.string.editContact_title_insert);
                 mState = STATE_INSERT;
                 mInsert = true;
             }
@@ -459,7 +464,7 @@
         }
         return super.onKeyDown(keyCode, event);
     }
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
@@ -549,7 +554,6 @@
     private void doRemovePhotoAction() {
         mPhoto = null;
         mPhotoChanged = true;
-        mPhotoImageView.setImageResource(R.drawable.ic_contact_picture);
         setPhotoPresent(false);
     }
     
@@ -593,8 +597,9 @@
     }
 
     private void updateRingtoneView(EditEntry entry) {
+        String ringtoneName;
         if (entry.data == null) {
-            updateDataView(entry, getString(R.string.default_ringtone));
+            ringtoneName = getString(R.string.default_ringtone);
         } else {
             Uri ringtoneUri = Uri.parse(entry.data);
             Ringtone ringtone = RingtoneManager.getRingtone(this, ringtoneUri);
@@ -602,8 +607,12 @@
                 Log.w(TAG, "ringtone's URI doesn't resolve to a Ringtone");
                 return;
             }
-            updateDataView(entry, ringtone.getTitle(this));
+            ringtoneName = ringtone.getTitle(this);
         }
+        
+        // Build actual "Ringtone: Default" string that is assigned to spinner.
+        String text = getString(R.string.ringtone_spinner, ringtoneName);
+        updateDataView(entry, text);
     }
     
     private void updateDataView(EditEntry entry, String text) {
@@ -1456,11 +1465,11 @@
         final LinearLayout layout = mLayout;
         layout.removeAllViews();
 
-        buildViewsForSection(layout, mPhoneEntries, R.string.listSeparatorCallNumber);
-        buildViewsForSection(layout, mEmailEntries, R.string.listSeparatorSendEmail);
-        buildViewsForSection(layout, mImEntries, R.string.listSeparatorSendIm);
-        buildViewsForSection(layout, mPostalEntries, R.string.listSeparatorMapAddress);
-        buildViewsForSection(layout, mOtherEntries, R.string.listSeparatorOtherInformation);
+        buildViewsForSection(layout, mPhoneEntries, R.string.listSeparatorCallNumber_edit);
+        buildViewsForSection(layout, mEmailEntries, R.string.listSeparatorSendEmail_edit);
+        buildViewsForSection(layout, mImEntries, R.string.listSeparatorSendIm_edit);
+        buildViewsForSection(layout, mPostalEntries, R.string.listSeparatorMapAddress_edit);
+        buildViewsForSection(layout, mOtherEntries, R.string.listSeparatorOtherInformation_edit);
     }
 
 
@@ -1530,7 +1539,7 @@
         // Bind data
         TextView data = (TextView) view.findViewById(R.id.data);
         TextView data2 = (TextView) view.findViewById(R.id.data2);
-
+        
         if (data instanceof Button) {
             data.setOnClickListener(this);
         }
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 4690b12..3a177b2 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -576,7 +576,16 @@
         separator.data = getString(R.string.listSeparatorOtherInformation);
         mOtherEntries.add(separator);
     }
-    
+
+    private Uri constructImToUrl(String host, String data) {
+	    // don't encode the url, because the Activity Manager can't find using the encoded url
+        StringBuilder buf = new StringBuilder("imto://");
+        buf.append(host);
+        buf.append('/');
+        buf.append(data);
+        return Uri.parse(buf.toString());
+    }
+
     /**
      * Build up the entries to display on the screen.
      * 
@@ -701,12 +710,11 @@
                     case Contacts.KIND_IM: {
                         Object protocolObj = ContactMethods.decodeImProtocol(
                                 methodsCursor.getString(METHODS_AUX_DATA_COLUMN));
-                        String providerCategory;
+                        String host;
                         if (protocolObj instanceof Number) {
                             int protocol = ((Number) protocolObj).intValue();
                             entry.label = protocolStrings[protocol];
-                            providerCategory = ContactMethods.lookupProviderCategoryFromId(
-                                    protocol);
+                            host = ContactMethods.lookupProviderNameFromId(protocol).toLowerCase();
                             if (protocol == ContactMethods.PROTOCOL_GOOGLE_TALK
                                     || protocol == ContactMethods.PROTOCOL_MSN) {
                                 entry.maxLabelLines = 2;
@@ -714,14 +722,12 @@
                         } else {
                             String providerName = (String) protocolObj;
                             entry.label = providerName;
-                            providerCategory = Im.Provider.getProviderCategoryFromName(
-                                    providerName);
+                            host = providerName.toLowerCase();
                         }
 
-                        // Only add the intent if there is a valid provider name
-                        if (!TextUtils.isEmpty(providerCategory)) {
-                            entry.intent = new Intent(Intent.ACTION_SENDTO,
-                                    Uri.fromParts("im", data, null)).addCategory(providerCategory);
+                        // Only add the intent if there is a valid host
+                        if (!TextUtils.isEmpty(host)) {
+                            entry.intent = new Intent(Intent.ACTION_SENDTO, constructImToUrl(host, data));
                         }
                         entry.data = data;
                         if (!methodsCursor.isNull(METHODS_STATUS_COLUMN)) {
@@ -755,26 +761,25 @@
                     String label;
                     Object protocolObj = ContactMethods.decodeImProtocol(
                             presenceCursor.getString(1));
-                    String providerCategory;
+                    String host;
                     if (protocolObj instanceof Number) {
                         int protocol = ((Number) protocolObj).intValue();
                         label = getResources().getStringArray(
                                 android.R.array.imProtocols)[protocol];
-                        providerCategory = ContactMethods.lookupProviderCategoryFromId(
-                                protocol);
+                        host = ContactMethods.lookupProviderNameFromId(protocol).toLowerCase();
                     } else {
                         String providerName = (String) protocolObj;
                         label = providerName;
-                        providerCategory = Im.Provider.getProviderCategoryFromName(providerName);
+                        host = providerName.toLowerCase();
                     }
 
-                    if (TextUtils.isEmpty(providerCategory)) {
+                    if (TextUtils.isEmpty(host)) {
                         // A valid provider name is required
                         continue;
                     }
 
-                    Intent intent = new Intent(Intent.ACTION_SENDTO,
-                            Uri.fromParts("im", data, null)).addCategory(providerCategory);
+
+                    Intent intent = new Intent(Intent.ACTION_SENDTO, constructImToUrl(host, data));
 
                     // Check to see if there is already an entry for this IM account
                     boolean addEntry = true;