diff --git a/res/drawable-finger/backpanel_bottom_white.9.png b/res/drawable-finger/backpanel_bottom_white.9.png
deleted file mode 100644
index ffcc228..0000000
--- a/res/drawable-finger/backpanel_bottom_white.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_textfield_activated_full.9.png b/res/drawable-finger/btn_dial_textfield_activated_full.9.png
deleted file mode 100644
index f0a571c..0000000
--- a/res/drawable-finger/btn_dial_textfield_activated_full.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_textfield_normal_full.9.png b/res/drawable-finger/btn_dial_textfield_normal_full.9.png
deleted file mode 100644
index 261d130..0000000
--- a/res/drawable-finger/btn_dial_textfield_normal_full.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_textfield_pressed_full.9.png b/res/drawable-finger/btn_dial_textfield_pressed_full.9.png
deleted file mode 100644
index 7db856b..0000000
--- a/res/drawable-finger/btn_dial_textfield_pressed_full.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/btn_dial_textfield_selected_full.9.png b/res/drawable-finger/btn_dial_textfield_selected_full.9.png
deleted file mode 100644
index 2667868..0000000
--- a/res/drawable-finger/btn_dial_textfield_selected_full.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/header_bottom_white.9.png b/res/drawable-finger/header_bottom_white.9.png
deleted file mode 100644
index 5d06aec..0000000
--- a/res/drawable-finger/header_bottom_white.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/ic_btn_write_sms.png b/res/drawable-finger/ic_btn_write_sms.png
deleted file mode 100644
index 0f2cf07..0000000
--- a/res/drawable-finger/ic_btn_write_sms.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/ic_dialer_fork_add_call.png b/res/drawable-finger/ic_dialer_fork_add_call.png
new file mode 100644
index 0000000..5a1555b
--- /dev/null
+++ b/res/drawable-finger/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/res/drawable-finger/ic_dialer_fork_current_call.png b/res/drawable-finger/ic_dialer_fork_current_call.png
new file mode 100644
index 0000000..1be783e
--- /dev/null
+++ b/res/drawable-finger/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/res/drawable-finger/ic_dialer_fork_tt_keypad.png b/res/drawable-finger/ic_dialer_fork_tt_keypad.png
new file mode 100644
index 0000000..4e3dd82
--- /dev/null
+++ b/res/drawable-finger/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_add_picture.png b/res/drawable-finger/ic_menu_add_picture.png
new file mode 100644
index 0000000..35f10b8
--- /dev/null
+++ b/res/drawable-finger/ic_menu_add_picture.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_contact.png b/res/drawable-finger/ic_menu_contact.png
deleted file mode 100644
index 29b7cd9..0000000
--- a/res/drawable-finger/ic_menu_contact.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/ic_menu_dialer.png b/res/drawable-finger/ic_menu_dialer.png
deleted file mode 100644
index db21f96..0000000
--- a/res/drawable-finger/ic_menu_dialer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/ic_menu_import_contact.png b/res/drawable-finger/ic_menu_import_contact.png
new file mode 100755
index 0000000..fcb16db
--- /dev/null
+++ b/res/drawable-finger/ic_menu_import_contact.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_refresh.png b/res/drawable-finger/ic_menu_refresh.png
new file mode 100755
index 0000000..77d70dd
--- /dev/null
+++ b/res/drawable-finger/ic_menu_refresh.png
Binary files differ
diff --git a/res/drawable-finger/ic_menu_send.png b/res/drawable-finger/ic_menu_send.png
deleted file mode 100644
index 74c096d..0000000
--- a/res/drawable-finger/ic_menu_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-finger/ic_menu_show_barcode.png b/res/drawable-finger/ic_menu_show_barcode.png
new file mode 100755
index 0000000..cb66ae5
--- /dev/null
+++ b/res/drawable-finger/ic_menu_show_barcode.png
Binary files differ
diff --git a/res/drawable/dialog_full_dark.9.png b/res/drawable/dialog_full_dark.9.png
deleted file mode 100755
index 18914b3..0000000
--- a/res/drawable/dialog_full_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_launcher_contacts_phones.png b/res/drawable/ic_launcher_contacts_phones.png
new file mode 100644
index 0000000..822cc31
--- /dev/null
+++ b/res/drawable/ic_launcher_contacts_phones.png
Binary files differ
diff --git a/res/drawable/ic_launcher_contacts_starred.png b/res/drawable/ic_launcher_contacts_starred.png
new file mode 100644
index 0000000..328761e
--- /dev/null
+++ b/res/drawable/ic_launcher_contacts_starred.png
Binary files differ
diff --git a/res/layout-finger/contacts_list_content.xml b/res/layout-finger/contacts_list_content.xml
index 23f8521..32b7ffc 100644
--- a/res/layout-finger/contacts_list_content.xml
+++ b/res/layout-finger/contacts_list_content.xml
@@ -18,29 +18,28 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical">
-<!-- The group banner isn't used anymore
-    <TextView 
-            android:id="@+id/contact_group"
-            android:text="@string/noContacts"
+
+    <ListView android:id="@android:id/list"
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:fastScrollEnabled="true"
+    />
+
+    <ScrollView android:id="@android:id/empty"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:fillViewport="true"
+    >
+        <TextView android:id="@+id/emptyText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@android:drawable/title_bar"
-            style="@android:style/TextAppearance.WindowTitle"/>
--->
-    <com.android.contacts.FastScrollView 
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-        <ListView android:id="@android:id/list"
-                android:layout_width="fill_parent" 
-                android:layout_height="fill_parent"
+            android:text="@string/noContacts"
+            android:textSize="20sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:paddingTop="10dip"
+            android:lineSpacingMultiplier="0.92"
         />
-
-        <TextView android:id="@android:id/empty"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:gravity="center"
-                android:text="@string/noContacts"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-        />
-    </com.android.contacts.FastScrollView>
+    </ScrollView>
 </LinearLayout>
diff --git a/res/layout-finger/dialpad_chooser_list_item.xml b/res/layout-finger/dialpad_chooser_list_item.xml
new file mode 100644
index 0000000..c5abeac
--- /dev/null
+++ b/res/layout-finger/dialpad_chooser_list_item.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<!-- Layout of a single item in the Dialer's "Dialpad chooser" UI. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="64px"
+        android:layout_height="64px"
+        android:scaleType="center" />
+
+    <TextView android:id="@+id/text"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center_vertical"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index 858d654..7d0f449 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -43,10 +43,10 @@
                 android:layout_marginLeft="6dip"
                 android:layout_marginRight="10dip"
             >
-                <Button android:id="@+id/photoButton"
+                <ImageButton android:id="@+id/photoButton"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-                    android:text="@string/addPicture"
+                    android:src="@drawable/ic_menu_add_picture"
                     android:gravity="center"
                 />
 
@@ -66,8 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="4dip"
                 android:gravity="center_vertical"
-                android:singleLine="true"
-                android:capitalize="words"
+                android:inputType="textPersonName|textCapWords"
                 android:hint="@string/ghostData_name"
                 android:nextFocusDown="@id/data"
             />
diff --git a/res/layout-finger/sync_settings.xml b/res/layout-finger/sync_settings.xml
new file mode 100644
index 0000000..50d0d47
--- /dev/null
+++ b/res/layout-finger/sync_settings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * 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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+>
+
+    <ListView android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+    />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/bottom_bar"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+    >
+        <Button android:id="@+id/ok"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/ok"
+        />
+
+        <Button android:id="@+id/cancel"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/cancel"
+        />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-finger/twelve_key_dialer.xml b/res/layout-finger/twelve_key_dialer.xml
index 84f2517..172a4ba 100644
--- a/res/layout-finger/twelve_key_dialer.xml
+++ b/res/layout-finger/twelve_key_dialer.xml
@@ -20,7 +20,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
 >
-    <LinearLayout
+    <LinearLayout android:id="@+id/digitsAndBackspace"
         android:layout_width="fill_parent"
         android:layout_height="66px"
         android:layout_marginTop="3px"
@@ -57,4 +57,15 @@
 
     <!-- Keypad section -->
     <include layout="@layout/dialpad" />
+
+    <!-- "Dialpad chooser" UI, shown only when the user brings up the
+         Dialer while a call is already in progress.
+         When this UI is visible, the other Dialer elements
+         (the textfield/button and the dialpad) are hidden. -->
+    <ListView android:id="@+id/dialpadChooser"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:footerDividersEnabled="true"
+    />
+
 </LinearLayout>
diff --git a/res/layout-land-finger/twelve_key_dialer.xml b/res/layout-land-finger/twelve_key_dialer.xml
index 3daf6d2..2b436b8 100644
--- a/res/layout-land-finger/twelve_key_dialer.xml
+++ b/res/layout-land-finger/twelve_key_dialer.xml
@@ -20,7 +20,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
 >
-    <LinearLayout
+    <LinearLayout android:id="@+id/digitsAndBackspace"
         android:layout_width="fill_parent"
         android:layout_height="66px"
         android:addStatesFromChildren="true"
@@ -58,4 +58,15 @@
         />
 
     </LinearLayout>
+
+    <!-- "Dialpad chooser" UI, shown only when the user brings up the
+         Dialer while a call is already in progress.
+         When this UI is visible, the other Dialer elements
+         (the textfield and button) are hidden. -->
+    <ListView android:id="@+id/dialpadChooser"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:footerDividersEnabled="true"
+    />
+
 </LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ac39f7d..9b8f033 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,65 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="attachToContact">Obrázek kontaktu</string>
-  <string name="button_discard">Zrušit změny</string>
-  <string name="button_save">Uložit</string>
-  <string name="cancelButtonText">Storno</string>
-  <string name="contactsList">Kontakty</string>
-  <string name="continueEditing">Pokračovat v úpravách</string>
-  <string name="customLabelPickerTitle">Vlastní štítek</string>
-  <string name="deleteConfirmation">Odstranit tento kontakt?</string>
-  <string name="discardChanges">Zrušit změny</string>
-  <string name="displayAllPreference">Zobrazit všechny kontakty</string>
-  <string name="displayAllPreference_summary">Zobrazit všechny kontakty nebo jen kontakty s telefonními čísly</string>
-  <string name="editContact_title_edit">Upravit kontakt</string>
-  <string name="editContact_title_insert">Nový kontakt</string>
-  <string name="emailLabelsGroup">E-mail</string>
-  <string name="errorDialogTitle">Upozornění!</string>
-  <string name="frequentList">Časté</string>
-  <string name="ghostData_company">Společnost</string>
-  <string name="ghostData_email">E-mailová adresa</string>
-  <string name="ghostData_im">Jméno pro zasílání rychlých zpráv</string>
-  <string name="ghostData_name">První a poslední</string>
-  <string name="ghostData_notes">Poznámka</string>
-  <string name="ghostData_phone">Telefonní číslo</string>
-  <string name="ghostData_postal">"Ulice\nMěsto, stát, PSČ\nZemě"</string>
-  <string name="ghostData_title">Poloha</string>
-  <string name="imLabelsGroup">Rych. zpr.</string>
-  <string name="importFromSim">Importovat z karty SIM</string>
-  <string name="invalidContactMessage">Kontakty musí mít názvy</string>
-  <string name="label_company">Společnost</string>
-  <string name="label_notes">Poznámky</string>
-  <string name="label_title">Funkce</string>
-  <string name="menu_addItem">a další</string>
-  <string name="menu_addStar">Přidat hvězdičku</string>
-  <string name="menu_call">Volat</string>
-  <string name="menu_callNumber">Volat<xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Odstranit kontakt</string>
-  <string name="menu_dialer">Telefon</string>
-  <string name="menu_doNotSave">Zrušit změny</string>
-  <string name="menu_done">Uložit</string>
-  <string name="menu_editContact">Upravit kontakt</string>
-  <string name="menu_editNumberBeforeCall">Upravit číslo před voláním</string>
-  <string name="menu_makeDefaultNumber">Vytvořit výchozí číslo</string>
-  <string name="menu_newContact">Nový kontakt</string>
-  <string name="menu_preferences">Nastavení</string>
-  <string name="menu_removeStar">Odebrat hvězdičku</string>
-  <string name="menu_sendEmail">Odeslat e-mail</string>
-  <string name="menu_sendSMS">Odeslat text</string>
-  <string name="menu_viewAddress">Adresa na mapě</string>
-  <string name="menu_viewContact">Zobrazit kontakt</string>
-  <string name="noButton">Storno</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Jiné</string>
-  <string name="phoneLabelsGroup">Telefon</string>
-  <string name="photoPickerNotFoundText">Žádné obrázky nejsou k dispozici.</string>
-  <string name="pickerNewContactHeader">Vytvořit nový kontakt</string>
-  <string name="postalLabelsGroup">Poštovní adresa</string>
-  <string name="searchHint">Hledat v kontaktech</string>
-  <string name="selectLabel">Vybrat štítek</string>
-  <string name="sms_entry_label">Odeslat SMS</string>
-  <string name="starredList">Hlavní</string>
-  <string name="strequentList">Oblíbené položky</string>
-  <string name="yesButton">OK</string>
+    <string name="contactsList">"Kontakty"</string>
+    <!-- no translation found for shortcutContact (1520089872483067797) -->
+    <skip />
+    <string name="starredList">"Hlavní"</string>
+    <string name="frequentList">"Časté"</string>
+    <string name="strequentList">"Oblíbené položky"</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">"Hledat v kontaktech"</string>
+    <string name="menu_newContact">"Nový kontakt"</string>
+    <string name="menu_viewContact">"Zobrazit kontakt"</string>
+    <!-- unknown placeholder CONTACT in menu_callNumber -->
+    <skip />
+    <string name="menu_addStar">"Přidat hvězdičku"</string>
+    <string name="menu_removeStar">"Odebrat hvězdičku"</string>
+    <!-- no translation found for menu_showBarcode (4627916987700748636) -->
+    <skip />
+    <string name="menu_editContact">"Upravit kontakt"</string>
+    <string name="menu_deleteContact">"Odstranit kontakt"</string>
+    <string name="menu_call">"Volat"</string>
+    <string name="menu_sendSMS">"Odeslat text"</string>
+    <string name="menu_sendEmail">"Odeslat e-mail"</string>
+    <string name="menu_viewAddress">"Adresa na mapě"</string>
+    <string name="menu_makeDefaultNumber">"Vytvořit výchozí číslo"</string>
+    <!-- no translation found for deleteConfirmation_title (1628057421142368583) -->
+    <skip />
+    <string name="deleteConfirmation">"Odstranit tento kontakt?"</string>
+    <string name="menu_done">"Uložit"</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">"a další"</string>
+    <string name="label_notes">"Poznámky"</string>
+    <!-- no translation found for label_ringtone (1269538172838343970) -->
+    <skip />
+    <string name="ghostData_name">"První a poslední"</string>
+    <string name="ghostData_company">"Společnost"</string>
+    <string name="ghostData_title">"Poloha"</string>
+    <string name="ghostData_im">"Jméno pro zasílání rychlých zpráv"</string>
+    <string name="ghostData_notes">"Poznámka"</string>
+    <string name="ghostData_phone">"Telefonní číslo"</string>
+    <string name="ghostData_email">"E-mailová adresa"</string>
+    <!-- unknown placeholder BREAK_0 in ghostData_postal -->
+    <skip />
+    <string name="invalidContactMessage">"Kontakty musí mít názvy"</string>
+    <string name="pickerNewContactHeader">"Vytvořit nový kontakt"</string>
+    <string name="selectLabel">"Vybrat štítek"</string>
+    <string name="phoneLabelsGroup">"Telefon"</string>
+    <string name="emailLabelsGroup">"E-mail"</string>
+    <string name="imLabelsGroup">"Rych. zpr."</string>
+    <string name="postalLabelsGroup">"Poštovní adresa"</string>
+    <string name="otherLabelsGroup">"Jiné"</string>
+    <!-- no translation found for otherLabels:0 (3318569574569948132) -->
+    <!-- no translation found for otherLabels:1 (3325413568383685728) -->
+    <string name="errorDialogTitle">"Upozornění!"</string>
+    <string name="photoPickerNotFoundText">"Žádné obrázky nejsou k dispozici."</string>
+    <string name="attachToContact">"Obrázek kontaktu"</string>
+    <string name="customLabelPickerTitle">"Vlastní štítek"</string>
+    <!-- no translation found for menu_displayGroup (2835746769742496686) -->
+    <skip />
+    <!-- no translation found for syncGroupPreference (759121296595419145) -->
+    <skip />
+    <string name="importFromSim">"Importovat z karty 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-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
deleted file mode 100644
index dc2aa59..0000000
--- a/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,124 +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="addPicture">Symbol hinzufügen</string>
-  <string name="allContacts">Alle Kontakte</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">Kontaktsymbol</string>
-  <string name="button_discard">Änderungen verwerfen</string>
-  <string name="button_save">Speichern</string>
-  <string name="cancelButtonText">Abbrechen</string>
-  <string name="contactCreatedToast">Kontakt erstellt.</string>
-  <string name="contactSavedToast">Kontakt gespeichert.</string>
-  <string name="contactsFavoritesLabel">Favoriten</string>
-  <string name="contactsIconLabel">Kontakte</string>
-  <string name="contactsList">Kontakte</string>
-  <string name="customLabelPickerTitle">Benutzerdefiniertes Etikett</string>
-  <string name="default_ringtone">Standard</string>
-  <string name="deleteConfirmation">Dieser Kontakt wird gelöscht.</string>
-  <string name="deleteConfirmation_title">Löschen</string>
-  <string name="dialerIconLabel">Wähltastatur</string>
-  <string name="dialerKeyboardHintText">Feste Tastatur zum Wählen verwenden</string>
-  <string name="doneButton">Fertig</string>
-  <string name="editContactDescription">Kontakt bearbeiten</string>
-  <string name="editContact_title_edit">Kontakt bearbeiten</string>
-  <string name="editContact_title_insert">Neuer Kontakt</string>
-  <string name="emailLabelsGroup">E-Mail</string>
-  <string name="errorDialogTitle">Keine Bilder</string>
-  <string name="frequentList">Häufig</string>
-  <string name="ghostData_company">Firma</string>
-  <string name="ghostData_email">E-Mail-Adresse</string>
-  <string name="ghostData_im">IM-Name</string>
-  <string name="ghostData_name">Vor- und Nachname</string>
-  <string name="ghostData_notes">Eigene Notiz</string>
-  <string name="ghostData_phone">Telefonnummer</string>
-  <string name="ghostData_postal">Postadresse</string>
-  <string name="ghostData_title">Position</string>
-  <string name="groupEmpty">Die \"<xliff:g id="groupName">%s</xliff:g>\" Gruppe ist leer.</string>
-  <string name="groupNameMyContacts">Eigene Kontakte</string>
-  <string name="groupNameWithPhones">Kontakte mit Telefonnummern</string>
-  <string name="imLabelsGroup">IM</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">SIM-Kontakt-Import</string>
-  <string name="insertContactDescription">Kontakt erstellen</string>
-  <string name="invalidContactMessage">Der Kontakt existiert nicht.</string>
-  <string name="label_company">Firma</string>
-  <string name="label_notes">Notizen</string>
-  <string name="label_ringtone">Klingelton</string>
-  <string name="label_title">Arbeitsbezeichnung</string>
-  <string name="listSeparatorCallNumber">Nummer wählen</string>
-  <string name="listSeparatorMapAddress">Kartenansicht Adresse</string>
-  <string name="listSeparatorOrganizations">Organisationen</string>
-  <string name="listSeparatorOtherInformation">Andere Informationen</string>
-  <string name="listSeparatorSendEmail">E-Mail senden</string>
-  <string name="listSeparatorSendIm">Sofortnachricht senden</string>
-  <string name="listSeparatorSendSmsMms">SMS/MMS senden</string>
-  <string name="menu_addItem">Weitere Info</string>
-  <string name="menu_addStar">Zu Favoriten hinzufügen</string>
-  <string name="menu_call">Anrufen</string>
-  <string name="menu_callNumber"><xliff:g id="contact">%s</xliff:g> anrufen</string>
-  <string name="menu_deleteContact">Kontakt löschen</string>
-  <string name="menu_dialer">Wähltastatur</string>
-  <string name="menu_displayGroup">Gruppe anzeigen</string>
-  <string name="menu_doNotSave">Änderungen verwerfen</string>
-  <string name="menu_done">Speichern</string>
-  <string name="menu_editContact">Kontakt bearbeiten</string>
-  <string name="menu_editNumberBeforeCall">Nummer vor Anruf bearbeiten</string>
-  <string name="menu_makeDefaultNumber">Standardnummer erstellen</string>
-  <string name="menu_newContact">Neuer Kontakt</string>
-  <string name="menu_newFavortie">Neuer Favorit</string>
-  <string name="menu_preferences">Einstellungen</string>
-  <string name="menu_removeStar">Aus Favoriten entfernen</string>
-  <string name="menu_sendEmail">E-Mail senden</string>
-  <string name="menu_sendSMS">SMS/MMS senden</string>
-  <string name="menu_sendTextMessage">SMS-Nachricht senden</string>
-  <string name="menu_viewAddress">Kartenansicht Adresse</string>
-  <string name="menu_viewContact">Kontakt anzeigen</string>
-  <string name="noButton">Abbrechen</string>
-  <string name="noContacts">Keine Kontakte.</string>
-  <string name="noContactsWithPhoneNumbers">Keine Kontakte mit Telefonnummern.</string>
-  <string name="noFavorites">Keine Favoriten.</string>
-  <string name="no_imei">Unbekannte IMEI</string>
-  <string name="ok">OK</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Andere</string>
-  <string name="phoneIconLabel">Telefon</string>
-  <string name="phoneLabelsGroup">Telefon</string>
-  <string name="photoPickerNotFoundText">Für Telefon stehen keine Bilder zur Verfügung.</string>
-  <string name="pickerNewContactHeader">Neuen Kontakt erstellen</string>
-  <string name="postalLabelsGroup">Postanschrift</string>
-  <string name="private_num">Privatnummer</string>
-  <string name="recentCallsIconLabel">Anrufliste</string>
-  <string name="recentCalls_addToContact">Zu Kontakten hinzufügen</string>
-  <string name="recentCalls_callNumber"><xliff:g id="who">%s</xliff:g> anrufen</string>
-  <string name="recentCalls_deleteAll">Anrufliste löschen</string>
-  <string name="recentCalls_editNumberBeforeCall">Nummer vor Anruf bearbeiten</string>
-  <string name="recentCalls_empty">Anrufliste ist leer.</string>
-  <string name="recentCalls_removeFromRecentList">Aus Anrufliste entfernen</string>
-  <string name="removePicture">Symbol entfernen</string>
-  <string name="searchHint">Kontakte suchen</string>
-  <string name="selectGroupsToSync">Gruppen synchronisieren</string>
-  <string name="selectLabel">Etikett auswählen</string>
-  <string name="select_group_title">Gruppe zur Anzeige auswählen</string>
-  <string name="send_to_voicemail_checkbox">Anrufe direkt zur Mobilbox suchen.</string>
-  <string name="send_to_voicemail_view">Anrufe werden direkt zur Mobilbox gesendet.</string>
-  <string name="shortcutContact">Kontakt</string>
-  <string name="showAllGroups">Alle Kontakte</string>
-  <string name="showingGroupTitle">
-					<xliff:g id="groupName">%s</xliff:g>
-				</string>
-  <string name="simContacts_emptyLoading">Laden von SIM-Karte\u2026</string>
-  <string name="simContacts_title">SIM-Karten-Kontakte</string>
-  <string name="sms_entry_label">SMS/MMS senden</string>
-  <string name="starredList">Mit Stern</string>
-  <string name="strequentList">Favoriten</string>
-  <string name="syncAllGroups">Alle Kontakte synchronisieren</string>
-  <string name="syncGroupChooserTitle">Gruppe für Synchronisierung auswählen</string>
-  <string name="syncGroupPreference">Gruppen synchronisieren</string>
-  <string name="syncGroupPreference_summary">Gruppen für Synchronisierung auswählen</string>
-  <string name="unknown">Unbekannt</string>
-  <string name="viewContactDesription">Kontakt anzeigen</string>
-  <string name="viewContactTitle">Kontaktdetails</string>
-  <string name="voicemail">Mobilbox</string>
-  <string name="yesButton">OK</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 0000000..0b98318
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,133 @@
+<?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">"Kontakte"</string>
+    <string name="shortcutContact">"Kontakt"</string>
+    <string name="starredList">"Markiert"</string>
+    <string name="frequentList">"Häufig"</string>
+    <string name="strequentList">"Favoriten"</string>
+    <string name="viewContactTitle">"Kontaktinformationen"</string>
+    <string name="viewContactDesription">"Kontakt anzeigen"</string>
+    <string name="editContactDescription">"Kontakt bearbeiten"</string>
+    <string name="insertContactDescription">"Kontakt erstellen"</string>
+    <string name="searchHint">"Kontakte durchsuchen"</string>
+    <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_removeStar">"Aus Favoriten entfernen"</string>
+    <!-- no translation found for menu_showBarcode (309973637178814132) -->
+    <skip />
+    <string name="menu_editContact">"Kontakt bearbeiten"</string>
+    <string name="menu_deleteContact">"Kontakt löschen"</string>
+    <string name="menu_call">"Anruf"</string>
+    <string name="menu_sendSMS">"SMS/MMS senden"</string>
+    <string name="menu_sendEmail">"E-Mail senden"</string>
+    <string name="menu_viewAddress">"Adresse auf der Karte"</string>
+    <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_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>
+    <string name="label_notes">"Notizen"</string>
+    <string name="label_ringtone">"Klingelton"</string>
+    <string name="ghostData_name">"Vor- und Nachname"</string>
+    <string name="ghostData_company">"Unternehmen"</string>
+    <string name="ghostData_title">"Position"</string>
+    <string name="ghostData_im">"IM-Name"</string>
+    <string name="ghostData_notes">"Meine Notiz"</string>
+    <string name="ghostData_phone">"Telefonnummer"</string>
+    <string name="ghostData_email">"E-Mail-Adresse"</string>
+    <string name="ghostData_postal">"Postanschrift"</string>
+    <string name="invalidContactMessage">"Dieser Kontakt existiert nicht."</string>
+    <string name="pickerNewContactHeader">"Neuen Kontakt erstellen"</string>
+    <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="postalLabelsGroup">"Postanschrift"</string>
+    <string name="otherLabelsGroup">"Sonstiges"</string>
+  <string-array name="otherLabels">
+    <item>"Organisation"</item>
+    <item>"Notiz"</item>
+  </string-array>
+    <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="menu_displayGroup">"Gruppe anzeigen"</string>
+    <string name="syncGroupPreference">"Synchron. bearbeiten"</string>
+    <string name="importFromSim">"Kontakte importieren"</string>
+    <string name="alphabet">"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+    <string name="send_to_voicemail_checkbox">"Anrufe direkt an Mailbox 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>
+    <string name="removePicture">"Symbol entfernen"</string>
+    <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="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>
+    <string name="groupNameMyContacts">"Meine Kontakte"</string>
+    <string name="groupNameWithPhones">"Kontakte mit Telefonnummern"</string>
+    <string name="contactCreatedToast">"Kontakt erstellt"</string>
+    <string name="contactSavedToast">"Kontakt gespeichert"</string>
+    <string name="listSeparatorCallNumber">"Rufnummer"</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="listSeparatorMapAddress">"Adresse in Maps"</string>
+    <string name="listSeparatorOrganizations">"Organisationen"</string>
+    <string name="listSeparatorOtherInformation">"Mehr Informationen"</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="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_removeFromRecentList">"Aus Anrufliste entfernen"</string>
+    <string name="recentCalls_deleteAll">"Anrufliste löschen"</string>
+    <string name="recentCalls_empty">"Anrufliste ist leer"</string>
+    <string name="imei">"IMEI"</string>
+    <string name="voicemail">"Mailbox"</string>
+    <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="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="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 />
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fdd1323..07b51da 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1,122 +1,126 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="addPicture">Add icon</string>
-  <string name="allContacts">All contacts</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">Contact icon</string>
-  <string name="button_discard">Discard changes</string>
-  <string name="button_save">Save</string>
-  <string name="cancelButtonText">Cancel</string>
-  <string name="contactCreatedToast">Contact created.</string>
-  <string name="contactSavedToast">Contact saved.</string>
-  <string name="contactsFavoritesLabel">Favourites</string>
-  <string name="contactsIconLabel">Contacts</string>
-  <string name="contactsList">Contacts</string>
-  <string name="customLabelPickerTitle">Custom label</string>
-  <string name="default_ringtone">Default</string>
-  <string name="deleteConfirmation">This contact will be deleted.</string>
-  <string name="deleteConfirmation_title">Delete</string>
-  <string name="dialerIconLabel">Dialer</string>
-  <string name="dialerKeyboardHintText">Use keyboard to dial</string>
-  <string name="doneButton">Done</string>
-  <string name="editContactDescription">Edit contact</string>
-  <string name="editContact_title_edit">Edit contact</string>
-  <string name="editContact_title_insert">New contact</string>
-  <string name="emailLabelsGroup">Email</string>
-  <string name="errorDialogTitle">No pictures</string>
-  <string name="frequentList">Frequent</string>
-  <string name="ghostData_company">Company</string>
-  <string name="ghostData_email">Email address</string>
-  <string name="ghostData_im">IM name</string>
-  <string name="ghostData_name">First and Last</string>
-  <string name="ghostData_notes">My note</string>
-  <string name="ghostData_phone">Phone number</string>
-  <string name="ghostData_postal">Postal address</string>
-  <string name="ghostData_title">Position</string>
-  <string name="groupEmpty">Your \"<xliff:g id="groupName">%s</xliff:g>\" group is empty.</string>
-  <string name="groupNameMyContacts">My Contacts</string>
-  <string name="groupNameWithPhones">Contacts with phone numbers</string>
-  <string name="imLabelsGroup">IM</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">Import from SIM card</string>
-  <string name="insertContactDescription">Create contact</string>
-  <string name="invalidContactMessage">The contact does not exist.</string>
-  <string name="label_company">Company</string>
-  <string name="label_notes">Notes</string>
-  <string name="label_ringtone">Ringtone</string>
-  <string name="label_title">Job title</string>
-  <string name="listSeparatorCallNumber">Dial number</string>
-  <string name="listSeparatorMapAddress">Map address</string>
-  <string name="listSeparatorOrganizations">Organisations</string>
-  <string name="listSeparatorOtherInformation">Other information</string>
-  <string name="listSeparatorSendEmail">Send email</string>
-  <string name="listSeparatorSendIm">Send instant message</string>
-  <string name="listSeparatorSendSmsMms">Send SMS/MMS</string>
-  <string name="menu_addItem">More info</string>
-  <string name="menu_addStar">Add to favourites</string>
-  <string name="menu_call">Call</string>
-  <string name="menu_callNumber">Call <xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Delete contact</string>
-  <string name="menu_dialer">Dialer</string>
-  <string name="menu_displayGroup">Display group</string>
-  <string name="menu_doNotSave">Discard changes</string>
-  <string name="menu_done">Save</string>
-  <string name="menu_editContact">Edit contact</string>
-  <string name="menu_editNumberBeforeCall">Edit number before call</string>
-  <string name="menu_makeDefaultNumber">Make default number</string>
-  <string name="menu_newContact">New contact</string>
-  <string name="menu_newFavortie">New favourite</string>
-  <string name="menu_preferences">Settings</string>
-  <string name="menu_removeStar">Remove from favourites</string>
-  <string name="menu_sendEmail">Send email</string>
-  <string name="menu_sendSMS">Send SMS/MMS</string>
-  <string name="menu_sendTextMessage">Send SMS message</string>
-  <string name="menu_viewAddress">Map address</string>
-  <string name="menu_viewContact">View contact</string>
-  <string name="noButton">Cancel</string>
-  <string name="noContacts">No contacts.</string>
-  <string name="noContactsWithPhoneNumbers">No contacts with phone numbers.</string>
-  <string name="noFavorites">No favourites.</string>
-  <string name="no_imei">Unknown IMEI</string>
-  <string name="ok">OK</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Other</string>
-  <string name="phoneIconLabel">Phone</string>
-  <string name="phoneLabelsGroup">Phone</string>
-  <string name="photoPickerNotFoundText">No pictures are available on the phone.</string>
-  <string name="pickerNewContactHeader">Create new contact</string>
-  <string name="postalLabelsGroup">Postal address</string>
-  <string name="private_num">Private number</string>
-  <string name="recentCallsIconLabel">Call log</string>
-  <string name="recentCalls_addToContact">Add to contacts</string>
-  <string name="recentCalls_callNumber">Call <xliff:g id="who">%s</xliff:g></string>
-  <string name="recentCalls_deleteAll">Clear call log</string>
-  <string name="recentCalls_editNumberBeforeCall">Edit number before call</string>
-  <string name="recentCalls_empty">Call log is empty.</string>
-  <string name="recentCalls_removeFromRecentList">Remove from call log</string>
-  <string name="removePicture">Remove icon</string>
-  <string name="searchHint">Search contacts</string>
-  <string name="selectGroupsToSync">Sync groups</string>
-  <string name="selectLabel">Select label</string>
-  <string name="select_group_title">Select group to display</string>
-  <string name="send_to_voicemail_checkbox">Send calls directly to voicemail.</string>
-  <string name="send_to_voicemail_view">Calls are sent directly to voicemail.</string>
-  <string name="shortcutContact">Contact</string>
-  <string name="showAllGroups">All contacts</string>
-  <string name="showingGroupTitle"><xliff:g id="groupName">%s</xliff:g></string>
-  <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
-  <string name="simContacts_title">SIM card contacts</string>
-  <string name="sms_entry_label">Send SMS/MMS</string>
-  <string name="starredList">Starred</string>
-  <string name="strequentList">Favourites</string>
-  <string name="syncAllGroups">Sync all contacts</string>
-  <string name="syncGroupChooserTitle">Select groups to sync</string>
-  <string name="syncGroupPreference">Sync groups</string>
-  <string name="syncGroupPreference_summary">Select groups to synchronize</string>
-  <string name="unknown">Unknown</string>
-  <string name="viewContactDesription">View contact</string>
-  <string name="viewContactTitle">Contact details</string>
-  <string name="voicemail">Voicemail</string>
-  <string name="yesButton">OK</string>
+    <string name="contactsList">"Contacts"</string>
+    <string name="shortcutContact">"Contact"</string>
+    <string name="starredList">"Starred"</string>
+    <string name="frequentList">"Frequent"</string>
+    <string name="strequentList">"Favourites"</string>
+    <string name="viewContactTitle">"Contact details"</string>
+    <string name="viewContactDesription">"View contact"</string>
+    <string name="editContactDescription">"Edit contact"</string>
+    <string name="insertContactDescription">"Create contact"</string>
+    <string name="searchHint">"Search contacts"</string>
+    <string name="menu_newContact">"New contact"</string>
+    <string name="menu_viewContact">"View contact"</string>
+    <!-- unknown placeholder CONTACT in menu_callNumber -->
+    <skip />
+    <string name="menu_addStar">"Add to favourites"</string>
+    <string name="menu_removeStar">"Remove from favourites"</string>
+    <!-- no translation found for menu_showBarcode (4627916987700748636) -->
+    <skip />
+    <string name="menu_editContact">"Edit contact"</string>
+    <string name="menu_deleteContact">"Delete contact"</string>
+    <string name="menu_call">"Call"</string>
+    <string name="menu_sendSMS">"Send SMS/MMS"</string>
+    <string name="menu_sendEmail">"Send email"</string>
+    <string name="menu_viewAddress">"Map address"</string>
+    <string name="menu_makeDefaultNumber">"Make default number"</string>
+    <string name="deleteConfirmation_title">"Delete"</string>
+    <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>
+    <string name="label_notes">"Notes"</string>
+    <string name="label_ringtone">"Ringtone"</string>
+    <string name="ghostData_name">"First and Last"</string>
+    <string name="ghostData_company">"Company"</string>
+    <string name="ghostData_title">"Position"</string>
+    <string name="ghostData_im">"IM name"</string>
+    <string name="ghostData_notes">"My note"</string>
+    <string name="ghostData_phone">"Phone number"</string>
+    <string name="ghostData_email">"Email address"</string>
+    <string name="ghostData_postal">"Postal address"</string>
+    <string name="invalidContactMessage">"The contact does not exist."</string>
+    <string name="pickerNewContactHeader">"Create new contact"</string>
+    <string name="selectLabel">"Select label"</string>
+    <string name="phoneLabelsGroup">"Phone"</string>
+    <string name="emailLabelsGroup">"Email"</string>
+    <string name="imLabelsGroup">"IM"</string>
+    <string name="postalLabelsGroup">"Postal address"</string>
+    <string name="otherLabelsGroup">"Other"</string>
+    <!-- no translation found for otherLabels:0 (3318569574569948132) -->
+    <!-- no translation found for otherLabels:1 (3325413568383685728) -->
+    <string name="errorDialogTitle">"No pictures"</string>
+    <string name="photoPickerNotFoundText">"No pictures are available on the phone."</string>
+    <string name="attachToContact">"Contact icon"</string>
+    <string name="customLabelPickerTitle">"Custom label"</string>
+    <string name="menu_displayGroup">"Display group"</string>
+    <string name="syncGroupPreference">"Sync groups"</string>
+    <string name="importFromSim">"Import from SIM card"</string>
+    <string name="alphabet">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+    <string name="send_to_voicemail_checkbox">"Send calls directly to voicemail."</string>
+    <string name="send_to_voicemail_view">"Calls are sent directly to voicemail."</string>
+    <string name="default_ringtone">"Default"</string>
+    <string name="addPicture">"Add icon"</string>
+    <string name="removePicture">"Remove icon"</string>
+    <string name="noContacts">"No contacts."</string>
+    <string name="noContactsWithPhoneNumbers">"No contacts with phone numbers."</string>
+    <string name="noFavorites">"No favourites."</string>
+    <string name="select_group_title">"Select group to display"</string>
+    <string name="groupEmpty">"Your \"<xliff:g id="GROUPNAME">%s</xliff:g>\" group is empty."</string>
+    <string name="showAllGroups">"All contacts"</string>
+    <string name="syncAllGroups">"Sync all contacts"</string>
+    <string name="groupNameMyContacts">"My Contacts"</string>
+    <string name="groupNameWithPhones">"Contacts with phone numbers"</string>
+    <string name="contactCreatedToast">"Contact created."</string>
+    <string name="contactSavedToast">"Contact saved."</string>
+    <string name="listSeparatorCallNumber">"Dial number"</string>
+    <string name="listSeparatorSendSmsMms">"Send SMS/MMS"</string>
+    <string name="listSeparatorSendEmail">"Send email"</string>
+    <string name="listSeparatorSendIm">"Send instant message"</string>
+    <string name="listSeparatorMapAddress">"Map address"</string>
+    <string name="listSeparatorOrganizations">"Organisations"</string>
+    <string name="listSeparatorOtherInformation">"Other information"</string>
+    <string name="contactsIconLabel">"Contacts"</string>
+    <string name="contactsFavoritesLabel">"Favourites"</string>
+    <string name="dialerIconLabel">"Dialer"</string>
+    <string name="recentCallsIconLabel">"Call log"</string>
+    <!-- no translation found for liveFolderAll (5991510762804226223) -->
+    <skip />
+    <!-- no translation found for liveFolderFavorites (8755759874416875970) -->
+    <skip />
+    <!-- no translation found for liveFolderPhone (3440101264360244544) -->
+    <skip />
+    <string name="menu_sendTextMessage">"Send SMS message"</string>
+    <!-- unknown placeholder WHO in recentCalls_callNumber -->
+    <skip />
+    <string name="recentCalls_editNumberBeforeCall">"Edit number before call"</string>
+    <string name="recentCalls_addToContact">"Add to contacts"</string>
+    <string name="recentCalls_removeFromRecentList">"Remove from call log"</string>
+    <string name="recentCalls_deleteAll">"Clear call log"</string>
+    <string name="recentCalls_empty">"Call log is empty."</string>
+    <string name="imei">"IMEI"</string>
+    <string name="voicemail">"Voicemail"</string>
+    <string name="unknown">"Unknown"</string>
+    <string name="private_num">"Private number"</string>
+    <string name="dialerKeyboardHintText">"Use keyboard to dial"</string>
+    <string name="simContacts_emptyLoading">"Loading from SIM card…"</string>
+    <string name="simContacts_title">"SIM card contacts"</string>
+    <!-- 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-rUS/strings.xml b/res/values-es-rUS/strings.xml
index db7617e..2f8a286 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1,124 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="addPicture">Agregar icono</string>
-  <string name="allContacts">Todos los contactos</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">Icono de Contacto</string>
-  <string name="button_discard">Rechazar cambios</string>
-  <string name="button_save">Guardar</string>
-  <string name="cancelButtonText">Cancelar</string>
-  <string name="contactCreatedToast">Contacto creado.</string>
-  <string name="contactSavedToast">Contacto guardado.</string>
-  <string name="contactsFavoritesLabel">Favoritos</string>
-  <string name="contactsIconLabel">Contactos</string>
-  <string name="contactsList">Contactos</string>
-  <string name="customLabelPickerTitle">Etiqueta personalizada</string>
-  <string name="default_ringtone">Predeterminado</string>
-  <string name="deleteConfirmation">Se eliminará este contacto.</string>
-  <string name="deleteConfirmation_title">Eliminar</string>
-  <string name="dialerIconLabel">Marcador</string>
-  <string name="dialerKeyboardHintText">Utilizar teclado para marcar</string>
-  <string name="doneButton">Listo</string>
-  <string name="editContactDescription">Editar contacto</string>
-  <string name="editContact_title_edit">Editar contacto</string>
-  <string name="editContact_title_insert">Nuevo contacto</string>
-  <string name="emailLabelsGroup">Correo electrónico</string>
-  <string name="errorDialogTitle">Ninguna imagen</string>
-  <string name="frequentList">Frecuente</string>
-  <string name="ghostData_company">Organización</string>
-  <string name="ghostData_email">Dirección de correo electrónico</string>
-  <string name="ghostData_im">Nombre MI</string>
-  <string name="ghostData_name">Nombre y apellido</string>
-  <string name="ghostData_notes">Mi nota</string>
-  <string name="ghostData_phone">Número de teléfono</string>
-  <string name="ghostData_postal">Dirección postal</string>
-  <string name="ghostData_title">Puesto</string>
-  <string name="groupEmpty">Su \"<xliff:g id="groupName">%s</xliff:g>\" grupo está vacío.</string>
-  <string name="groupNameMyContacts">Mis contactos</string>
-  <string name="groupNameWithPhones">Contactos con números de teléfono</string>
-  <string name="imLabelsGroup">MI</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">Importador de contactos de la SIM</string>
-  <string name="insertContactDescription">Crear contacto</string>
-  <string name="invalidContactMessage">El contacto no existe. </string>
-  <string name="label_company">Organización</string>
-  <string name="label_notes">Notas</string>
-  <string name="label_ringtone">Tono de timbre</string>
-  <string name="label_title">Título</string>
-  <string name="listSeparatorCallNumber">Marcar número</string>
-  <string name="listSeparatorMapAddress">Dirección en el mapa</string>
-  <string name="listSeparatorOrganizations">Organizaciones</string>
-  <string name="listSeparatorOtherInformation">Otra información</string>
-  <string name="listSeparatorSendEmail">Enviar correo electrónico</string>
-  <string name="listSeparatorSendIm">Enviar mensaje instantáneo</string>
-  <string name="listSeparatorSendSmsMms">Enviar SMS/MMS</string>
-  <string name="menu_addItem">Más información</string>
-  <string name="menu_addStar">Agregar a favoritos</string>
-  <string name="menu_call">Llamar</string>
-  <string name="menu_callNumber">Llamar a <xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Eliminar contacto</string>
-  <string name="menu_dialer">Marcador</string>
-  <string name="menu_displayGroup">Mostrar grupo</string>
-  <string name="menu_doNotSave">Rechazar cambios</string>
-  <string name="menu_done">Guardar</string>
-  <string name="menu_editContact">Editar contacto</string>
-  <string name="menu_editNumberBeforeCall">Editar número antes de llamar</string>
-  <string name="menu_makeDefaultNumber">Convertir en número predeterminado</string>
-  <string name="menu_newContact">Nuevo contacto</string>
-  <string name="menu_newFavortie">Nuevo favorito</string>
-  <string name="menu_preferences">Configuración</string>
-  <string name="menu_removeStar">Quitar de favoritos</string>
-  <string name="menu_sendEmail">Enviar correo electrónico</string>
-  <string name="menu_sendSMS">Enviar SMS/MMS</string>
-  <string name="menu_sendTextMessage">Enviar mensaje SMS </string>
-  <string name="menu_viewAddress">Dirección en el mapa</string>
-  <string name="menu_viewContact">Ver contacto</string>
-  <string name="noButton">Cancelar</string>
-  <string name="noContacts">No hay contactos. </string>
-  <string name="noContactsWithPhoneNumbers">Sin contactos con números de teléfono. </string>
-  <string name="noFavorites">Sin favoritos.</string>
-  <string name="no_imei">IMEI desconocido</string>
-  <string name="ok">Aceptar</string>
-  <string name="okButtonText">Aceptar</string>
-  <string name="otherLabelsGroup">Otros</string>
-  <string name="phoneIconLabel">Teléfono</string>
-  <string name="phoneLabelsGroup">Teléfono</string>
-  <string name="photoPickerNotFoundText">No se dispone de imágenes en el teléfono. </string>
-  <string name="pickerNewContactHeader">Crear nuevo contacto</string>
-  <string name="postalLabelsGroup">Dirección postal</string>
-  <string name="private_num">Número privado</string>
-  <string name="recentCallsIconLabel">Registro de llamadas</string>
-  <string name="recentCalls_addToContact">Agregar a contactos</string>
-  <string name="recentCalls_callNumber">Llamar a <xliff:g id="who">%s</xliff:g></string>
-  <string name="recentCalls_deleteAll">Borrar registro de llamadas</string>
-  <string name="recentCalls_editNumberBeforeCall">Editar número antes de llamar</string>
-  <string name="recentCalls_empty">El registro de la llamada está vacío.</string>
-  <string name="recentCalls_removeFromRecentList">Eliminar del registro de llamadas</string>
-  <string name="removePicture">Eliminar icono</string>
-  <string name="searchHint">Buscar contactos</string>
-  <string name="selectGroupsToSync">Grupos de sincronización</string>
-  <string name="selectLabel">Seleccionar etiqueta</string>
-  <string name="select_group_title">Seleccionar grupo a visualizar</string>
-  <string name="send_to_voicemail_checkbox">Enviar las llamadas directamente al correo de voz.</string>
-  <string name="send_to_voicemail_view">Las llamadas se envían directamente al correo de voz.</string>
-  <string name="shortcutContact">Contacto</string>
-  <string name="showAllGroups">Todos los contactos</string>
-  <string name="showingGroupTitle">
-					<xliff:g id="groupName">%s</xliff:g>
-				</string>
-  <string name="simContacts_emptyLoading">Cargando de tarjeta SIM\u2026</string>
-  <string name="simContacts_title">Contactos de la tarjeta SIM</string>
-  <string name="sms_entry_label">Enviar SMS/MMS</string>
-  <string name="starredList">Con estrella</string>
-  <string name="strequentList">Favoritos</string>
-  <string name="syncAllGroups">Sincronizar todos los contactos</string>
-  <string name="syncGroupChooserTitle">Seleccionar grupos a sincronizar</string>
-  <string name="syncGroupPreference">Grupos de sincronización</string>
-  <string name="syncGroupPreference_summary">Seleccionar grupos a sincronizar</string>
-  <string name="unknown">Desconocido</string>
-  <string name="viewContactDesription">Ver contacto</string>
-  <string name="viewContactTitle">Detalles del contacto</string>
-  <string name="voicemail">Correo de voz</string>
-  <string name="yesButton">Aceptar</string>
+    <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-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 649348f..0000000
--- a/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,124 +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="addPicture">Ajouter une icône</string>
-  <string name="allContacts">Tous les contacts</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">Icône de contact</string>
-  <string name="button_discard">Abandonner les modifications</string>
-  <string name="button_save">Enregistrer</string>
-  <string name="cancelButtonText">Annuler</string>
-  <string name="contactCreatedToast">Contact créé.</string>
-  <string name="contactSavedToast">Contact enregistré.</string>
-  <string name="contactsFavoritesLabel">Favoris</string>
-  <string name="contactsIconLabel">Contacts</string>
-  <string name="contactsList">Contacts</string>
-  <string name="customLabelPickerTitle">Étiquette personnalisée</string>
-  <string name="default_ringtone">Par défaut</string>
-  <string name="deleteConfirmation">Ce contact sera supprimé.</string>
-  <string name="deleteConfirmation_title">Supprimer</string>
-  <string name="dialerIconLabel">Numéroteur</string>
-  <string name="dialerKeyboardHintText">Utiliser le clavier pour numéroter</string>
-  <string name="doneButton">Terminé</string>
-  <string name="editContactDescription">Modifier le contact</string>
-  <string name="editContact_title_edit">Modifier le contact</string>
-  <string name="editContact_title_insert">Nouveau contact</string>
-  <string name="emailLabelsGroup">Email</string>
-  <string name="errorDialogTitle">Aucune image</string>
-  <string name="frequentList">Fréquent</string>
-  <string name="ghostData_company">Société</string>
-  <string name="ghostData_email">Adresse de messagerie</string>
-  <string name="ghostData_im">Nom IM</string>
-  <string name="ghostData_name">Prénom et Nom</string>
-  <string name="ghostData_notes">Ma note</string>
-  <string name="ghostData_phone">Numéro de téléphone</string>
-  <string name="ghostData_postal">Adresse postale</string>
-  <string name="ghostData_title">Position</string>
-  <string name="groupEmpty">Votre groupe \"<xliff:g id="groupName">%s</xliff:g>\" est vide.</string>
-  <string name="groupNameMyContacts">Mes contacts</string>
-  <string name="groupNameWithPhones">Contacts avec numéros de téléphone</string>
-  <string name="imLabelsGroup">IM</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">Importateur de contacts SIM</string>
-  <string name="insertContactDescription">Créer un contact</string>
-  <string name="invalidContactMessage">Le contact n\'existe pas.</string>
-  <string name="label_company">Société</string>
-  <string name="label_notes">Notes</string>
-  <string name="label_ringtone">Sonnerie</string>
-  <string name="label_title">Titre</string>
-  <string name="listSeparatorCallNumber">Composer le numéro</string>
-  <string name="listSeparatorMapAddress">Adresse carte</string>
-  <string name="listSeparatorOrganizations">Organisations</string>
-  <string name="listSeparatorOtherInformation">Autres informations</string>
-  <string name="listSeparatorSendEmail">Envoyer e-mail</string>
-  <string name="listSeparatorSendIm">Envoyer message instantané</string>
-  <string name="listSeparatorSendSmsMms">Envoyer SMS/MMS</string>
-  <string name="menu_addItem">Plus d\'infos</string>
-  <string name="menu_addStar">Ajouter aux favoris</string>
-  <string name="menu_call">Appeler</string>
-  <string name="menu_callNumber">Appeler <xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Supprimer le contact</string>
-  <string name="menu_dialer">Numéroteur</string>
-  <string name="menu_displayGroup">Afficher le groupe</string>
-  <string name="menu_doNotSave">Abandonner les modifications</string>
-  <string name="menu_done">Enregistrer</string>
-  <string name="menu_editContact">Modifier le contact</string>
-  <string name="menu_editNumberBeforeCall">Modifier le numéro avant l\'appel</string>
-  <string name="menu_makeDefaultNumber">Définir numéro par défaut</string>
-  <string name="menu_newContact">Nouveau contact</string>
-  <string name="menu_newFavortie">Nouveau favori</string>
-  <string name="menu_preferences">Paramètres</string>
-  <string name="menu_removeStar">Supprimer des favoris</string>
-  <string name="menu_sendEmail">Envoyer e-mail</string>
-  <string name="menu_sendSMS">Envoyer SMS/MMS</string>
-  <string name="menu_sendTextMessage">Envoyer SMS</string>
-  <string name="menu_viewAddress">Adresse carte</string>
-  <string name="menu_viewContact">Afficher le contact</string>
-  <string name="noButton">Annuler</string>
-  <string name="noContacts">Aucun contact.</string>
-  <string name="noContactsWithPhoneNumbers">Aucun contact avec numéros de téléphone.</string>
-  <string name="noFavorites">Aucun favori.</string>
-  <string name="no_imei">IMEI inconnu</string>
-  <string name="ok">OK</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Autre</string>
-  <string name="phoneIconLabel">Téléphone</string>
-  <string name="phoneLabelsGroup">Téléphone</string>
-  <string name="photoPickerNotFoundText">Aucune image disponible sur le téléphone.</string>
-  <string name="pickerNewContactHeader">Créer un nouveau contact</string>
-  <string name="postalLabelsGroup">Adresse postale</string>
-  <string name="private_num">Numéro privé</string>
-  <string name="recentCallsIconLabel">Journal d\'appel</string>
-  <string name="recentCalls_addToContact">Ajouter aux contacts</string>
-  <string name="recentCalls_callNumber">Appeler <xliff:g id="who">%s</xliff:g></string>
-  <string name="recentCalls_deleteAll">Effacer le journal d\'appel</string>
-  <string name="recentCalls_editNumberBeforeCall">Modifier le numéro avant l\'appel</string>
-  <string name="recentCalls_empty">Le journal d\'appel est vide.</string>
-  <string name="recentCalls_removeFromRecentList">Supprimer du journal d\'appel</string>
-  <string name="removePicture">Supprimer l\'icône</string>
-  <string name="searchHint">Rechercher les contacts</string>
-  <string name="selectGroupsToSync">Synchroniser les groupes</string>
-  <string name="selectLabel">Sélectionner étiquette</string>
-  <string name="select_group_title">Sélectionner un groupe à afficher</string>
-  <string name="send_to_voicemail_checkbox">Envoyez les appels directement à la messagerie.</string>
-  <string name="send_to_voicemail_view">Les appels sont envoyés directement à la messagerie.</string>
-  <string name="shortcutContact">Contact</string>
-  <string name="showAllGroups">Tous les contacts</string>
-  <string name="showingGroupTitle">
-					<xliff:g id="groupName">%s</xliff:g>
-				</string>
-  <string name="simContacts_emptyLoading">Chargement depuis la carte SIM\u2026</string>
-  <string name="simContacts_title">Contacts de la carte SIM</string>
-  <string name="sms_entry_label">Envoyer SMS/MMS</string>
-  <string name="starredList">Étoilé</string>
-  <string name="strequentList">Favoris</string>
-  <string name="syncAllGroups">Synchroniser tous les contacts</string>
-  <string name="syncGroupChooserTitle">Sélectionner les groupes à synchroniser</string>
-  <string name="syncGroupPreference">Synchroniser les groupes</string>
-  <string name="syncGroupPreference_summary">Sélectionner les groupes à synchroniser</string>
-  <string name="unknown">Inconnu</string>
-  <string name="viewContactDesription">Afficher le contact</string>
-  <string name="viewContactTitle">Détails du contact</string>
-  <string name="voicemail">Messagerie vocale</string>
-  <string name="yesButton">OK</string>
-</resources>
diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml
deleted file mode 100644
index 24e3e17..0000000
--- a/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,124 +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="addPicture">Aggiungi icona</string>
-  <string name="allContacts">Tutti i contatti</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">Icona Contatti</string>
-  <string name="button_discard">Ignora modifiche</string>
-  <string name="button_save">Salva</string>
-  <string name="cancelButtonText">Annulla</string>
-  <string name="contactCreatedToast">Creazione contatto completata.</string>
-  <string name="contactSavedToast">Salvataggio contatto completato.</string>
-  <string name="contactsFavoritesLabel">Preferiti</string>
-  <string name="contactsIconLabel">Contatti</string>
-  <string name="contactsList">Contatti</string>
-  <string name="customLabelPickerTitle">Etichetta personalizzata</string>
-  <string name="default_ringtone">Predefinito</string>
-  <string name="deleteConfirmation">Il contatto verrà eliminato.</string>
-  <string name="deleteConfirmation_title">Elimina</string>
-  <string name="dialerIconLabel">Dialer</string>
-  <string name="dialerKeyboardHintText">Utilizzare la tastiera per comporre il numero</string>
-  <string name="doneButton">Completato</string>
-  <string name="editContactDescription">Modifica contatto</string>
-  <string name="editContact_title_edit">Modifica contatto</string>
-  <string name="editContact_title_insert">Nuovo contatto</string>
-  <string name="emailLabelsGroup">Email</string>
-  <string name="errorDialogTitle">Nessuna immagine</string>
-  <string name="frequentList">Frequente</string>
-  <string name="ghostData_company">Società</string>
-  <string name="ghostData_email">Indirizzo e-mail</string>
-  <string name="ghostData_im">Nome IM</string>
-  <string name="ghostData_name">Nome e cognome</string>
-  <string name="ghostData_notes">Nota</string>
-  <string name="ghostData_phone">Numero di telefono</string>
-  <string name="ghostData_postal">Indirizzo postale</string>
-  <string name="ghostData_title">Posizione</string>
-  <string name="groupEmpty">Il gruppo \"<xliff:g id="groupName">%s</xliff:g>\" è vuoto.</string>
-  <string name="groupNameMyContacts">Contatti</string>
-  <string name="groupNameWithPhones">Contatti con numeri di telefono</string>
-  <string name="imLabelsGroup">IM</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">Importazione contati SIM</string>
-  <string name="insertContactDescription">Crea contatto</string>
-  <string name="invalidContactMessage">Il contatto non esiste.</string>
-  <string name="label_company">Società</string>
-  <string name="label_notes">Note</string>
-  <string name="label_ringtone">Suoneria</string>
-  <string name="label_title">Posizione</string>
-  <string name="listSeparatorCallNumber">Componi numero</string>
-  <string name="listSeparatorMapAddress">Indirizzo su cartina</string>
-  <string name="listSeparatorOrganizations">Organizzazioni</string>
-  <string name="listSeparatorOtherInformation">Altre informazioni</string>
-  <string name="listSeparatorSendEmail">Invia messaggio e-mail</string>
-  <string name="listSeparatorSendIm">Invia messaggio immediato</string>
-  <string name="listSeparatorSendSmsMms">Invia SMS/MMS</string>
-  <string name="menu_addItem">Ulteriori informazioni</string>
-  <string name="menu_addStar">Aggiungi a Preferiti</string>
-  <string name="menu_call">Chiama</string>
-  <string name="menu_callNumber">Chiama <xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Elimina contatto</string>
-  <string name="menu_dialer">Dialer</string>
-  <string name="menu_displayGroup">Visualizza gruppo</string>
-  <string name="menu_doNotSave">Ignora modifiche</string>
-  <string name="menu_done">Salva</string>
-  <string name="menu_editContact">Modifica contatto</string>
-  <string name="menu_editNumberBeforeCall">Modifica numero prima di chiamare</string>
-  <string name="menu_makeDefaultNumber">Imposta come numero predefinito</string>
-  <string name="menu_newContact">Nuovo contatto</string>
-  <string name="menu_newFavortie">Nuovo preferito</string>
-  <string name="menu_preferences">Impostazioni</string>
-  <string name="menu_removeStar">Rimuovi da Preferiti</string>
-  <string name="menu_sendEmail">Invia messaggio e-mail</string>
-  <string name="menu_sendSMS">Invia SMS/MMS</string>
-  <string name="menu_sendTextMessage">Invia messaggio SMS</string>
-  <string name="menu_viewAddress">Indirizzo su cartina</string>
-  <string name="menu_viewContact">Visualizza contatto</string>
-  <string name="noButton">Annulla</string>
-  <string name="noContacts">Nessun contatto.</string>
-  <string name="noContactsWithPhoneNumbers">Nessun contatto con numeri di telefono.</string>
-  <string name="noFavorites">Nessun preferito.</string>
-  <string name="no_imei">IMEI sconosciuto</string>
-  <string name="ok">OK</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Altro</string>
-  <string name="phoneIconLabel">Telefono</string>
-  <string name="phoneLabelsGroup">Telefono</string>
-  <string name="photoPickerNotFoundText">Nessuna immagine disponibile sul telefono.</string>
-  <string name="pickerNewContactHeader">Crea nuovo contatto</string>
-  <string name="postalLabelsGroup">Indirizzo postale</string>
-  <string name="private_num">Numero privato</string>
-  <string name="recentCallsIconLabel">Registro chiamate</string>
-  <string name="recentCalls_addToContact">Aggiungi a Contatti</string>
-  <string name="recentCalls_callNumber">Chiama <xliff:g id="who">%s</xliff:g></string>
-  <string name="recentCalls_deleteAll">Cancella registro chiamate</string>
-  <string name="recentCalls_editNumberBeforeCall">Modifica numero prima di chiamare</string>
-  <string name="recentCalls_empty">Il registro chiamate è vuoto.</string>
-  <string name="recentCalls_removeFromRecentList">Rimuovi da registro chiamate</string>
-  <string name="removePicture">Icona Rimuovi</string>
-  <string name="searchHint">Cerca contatti</string>
-  <string name="selectGroupsToSync">Sincronizza gruppi</string>
-  <string name="selectLabel">Seleziona etichetta</string>
-  <string name="select_group_title">Seleziona gruppo da visualizzare</string>
-  <string name="send_to_voicemail_checkbox">Invia le chiamate direttamente alla casella vocale.</string>
-  <string name="send_to_voicemail_view">Le chiamate vengono inviate direttamente alla casella vocale.</string>
-  <string name="shortcutContact">Contatto</string>
-  <string name="showAllGroups">Tutti i contatti</string>
-  <string name="showingGroupTitle">
-					<xliff:g id="groupName">%s</xliff:g>
-				</string>
-  <string name="simContacts_emptyLoading">Caricamento dalla scheda SIM in corso\u2026</string>
-  <string name="simContacts_title">Contatti scheda SIM</string>
-  <string name="sms_entry_label">Invia SMS/MMS</string>
-  <string name="starredList">Primo piano</string>
-  <string name="strequentList">Preferiti</string>
-  <string name="syncAllGroups">Sincronizza tutti i contatti</string>
-  <string name="syncGroupChooserTitle">Selezionare i gruppi da sincronizzare</string>
-  <string name="syncGroupPreference">Sincronizza gruppi</string>
-  <string name="syncGroupPreference_summary">Selezionare i gruppi da sincronizzare</string>
-  <string name="unknown">Sconosciuto</string>
-  <string name="viewContactDesription">Visualizza contatto</string>
-  <string name="viewContactTitle">Dettagli contatto</string>
-  <string name="voicemail">Posta vocale</string>
-  <string name="yesButton">OK</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 0000000..cb8c49c
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,135 @@
+<?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">"連絡先"</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>
+    <!-- no translation found for menu_addStar (2908478235715404876) -->
+    <skip />
+    <!-- no translation found for menu_removeStar (5844227078364227030) -->
+    <skip />
+    <!-- no translation found for menu_showBarcode (309973637178814132) -->
+    <skip />
+    <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="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>
+    <string name="label_notes">"メモ"</string>
+    <string name="label_ringtone">"着信音"</string>
+    <string name="ghostData_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>
+    <!-- no translation found for customLabelPickerTitle (1081475101983255212) -->
+    <skip />
+    <string name="menu_displayGroup">"グループを表示"</string>
+    <string name="syncGroupPreference">"同期グループを編集"</string>
+    <string name="importFromSim">"連絡先をインポート"</string>
+    <string name="alphabet">"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</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>
+    <!-- no translation found for select_group_title (7955698611959835612) -->
+    <skip />
+    <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="listSeparatorSendSmsMms">"SMS/MMSを送信"</string>
+    <string name="listSeparatorSendEmail">"メールを送信"</string>
+    <string name="listSeparatorSendIm">"インスタントメッセージを送信"</string>
+    <string name="listSeparatorMapAddress">"地図の住所"</string>
+    <string name="listSeparatorOrganizations">"組織"</string>
+    <string name="listSeparatorOtherInformation">"その他の情報"</string>
+    <string name="contactsIconLabel">"連絡先"</string>
+    <string name="contactsFavoritesLabel">"お気に入り"</string>
+    <string name="dialerIconLabel">"ダイヤラ"</string>
+    <string name="recentCallsIconLabel">"通話ログ"</string>
+    <!-- no translation found for liveFolderAll (4789010460767506206) -->
+    <skip />
+    <!-- no translation found for liveFolderFavorites (3100957542927222282) -->
+    <skip />
+    <!-- no translation found for liveFolderPhone (3739376066610926780) -->
+    <skip />
+    <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>
+    <!-- no translation found for dialerDialpadHintText (5824490365898349041) -->
+    <skip />
+    <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>
+    <!-- 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 />
+</resources>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
index 9955277..09ce1bb 100644
--- a/res/values-nl-rNL/strings.xml
+++ b/res/values-nl-rNL/strings.xml
@@ -1,65 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="attachToContact">Afbeelding contactpersoon </string>
-  <string name="button_discard">Wijzigingen negeren</string>
-  <string name="button_save">Opslaan</string>
-  <string name="cancelButtonText">Annuleren</string>
-  <string name="contactsList">Contacten</string>
-  <string name="continueEditing">Bewerken hervatten</string>
-  <string name="customLabelPickerTitle">Aangepast label</string>
-  <string name="deleteConfirmation">Deze contact verwijderen?</string>
-  <string name="discardChanges">Wijzigingen negeren</string>
-  <string name="displayAllPreference">Alle contacten weergeven</string>
-  <string name="displayAllPreference_summary">Alle contacten weergeven, of alleen die met telefoonnummers</string>
-  <string name="editContact_title_edit">Contact bewerken</string>
-  <string name="editContact_title_insert">Nieuw contact</string>
-  <string name="emailLabelsGroup">E-mail</string>
-  <string name="errorDialogTitle">Let op!</string>
-  <string name="frequentList">Regelmatig</string>
-  <string name="ghostData_company">Bedrijf</string>
-  <string name="ghostData_email">E-mailadres</string>
-  <string name="ghostData_im">IM-naam</string>
-  <string name="ghostData_name">Eerste en laatste</string>
-  <string name="ghostData_notes">Mijn opmerking</string>
-  <string name="ghostData_phone">Telefoonnummer</string>
-  <string name="ghostData_postal">"Straat\nPlaats, staat postcode\nland"</string>
-  <string name="ghostData_title">Positie</string>
-  <string name="imLabelsGroup">Expresbericht</string>
-  <string name="importFromSim">Importeren van sim-kaart</string>
-  <string name="invalidContactMessage">Contacten moeten namen hebben</string>
-  <string name="label_company">Bedrijf</string>
-  <string name="label_notes">Opmerkingen</string>
-  <string name="label_title">Functie</string>
-  <string name="menu_addItem">Meer toevoegen</string>
-  <string name="menu_addStar">Ster toevoegen</string>
-  <string name="menu_call">Bellen</string>
-  <string name="menu_callNumber">Bellen<xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">Contact verwijderen</string>
-  <string name="menu_dialer">Kiezer</string>
-  <string name="menu_doNotSave">Wijzigingen negeren</string>
-  <string name="menu_done">Opslaan</string>
-  <string name="menu_editContact">Contact bewerken</string>
-  <string name="menu_editNumberBeforeCall">Nummer bewerken voor bellen</string>
-  <string name="menu_makeDefaultNumber">Standaardnummer maken</string>
-  <string name="menu_newContact">Nieuw contact</string>
-  <string name="menu_preferences">Instellingen</string>
-  <string name="menu_removeStar">Ster verwijderen</string>
-  <string name="menu_sendEmail">E-mail verzenden</string>
-  <string name="menu_sendSMS">Tekst verzenden</string>
-  <string name="menu_viewAddress">Kaartadres</string>
-  <string name="menu_viewContact">Contact weergeven</string>
-  <string name="noButton">Annuleren</string>
-  <string name="okButtonText">OK</string>
-  <string name="otherLabelsGroup">Overig</string>
-  <string name="phoneLabelsGroup">Telefoon</string>
-  <string name="photoPickerNotFoundText">Geen afbeeldingen beschikbaar.</string>
-  <string name="pickerNewContactHeader">Nieuwe contact maken</string>
-  <string name="postalLabelsGroup">Postadres</string>
-  <string name="searchHint">Contacten zoeken</string>
-  <string name="selectLabel">Label selecteren</string>
-  <string name="sms_entry_label">SMS verzenden</string>
-  <string name="starredList">Met ster</string>
-  <string name="strequentList">Favorieten</string>
-  <string name="yesButton">OK</string>
+    <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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 8d527f5..0000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,124 +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="addPicture">新增圖示</string>
-  <string name="allContacts">所有連絡人</string>
-  <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-  <string name="attachToContact">連絡人圖示</string>
-  <string name="button_discard">放棄變更</string>
-  <string name="button_save">儲存</string>
-  <string name="cancelButtonText">取消</string>
-  <string name="contactCreatedToast">已經建立連絡人。</string>
-  <string name="contactSavedToast">已經儲存連絡人。</string>
-  <string name="contactsFavoritesLabel">我的最愛</string>
-  <string name="contactsIconLabel">連絡人</string>
-  <string name="contactsList">連絡人</string>
-  <string name="customLabelPickerTitle">自訂標籤</string>
-  <string name="default_ringtone">預設值</string>
-  <string name="deleteConfirmation">將會刪除此連絡人。</string>
-  <string name="deleteConfirmation_title">刪除</string>
-  <string name="dialerIconLabel">撥號員</string>
-  <string name="dialerKeyboardHintText">使用鍵盤撥號</string>
-  <string name="doneButton">完成</string>
-  <string name="editContactDescription">編輯連絡人</string>
-  <string name="editContact_title_edit">編輯連絡人</string>
-  <string name="editContact_title_insert">新增連絡人</string>
-  <string name="emailLabelsGroup">電子郵件</string>
-  <string name="errorDialogTitle">無圖片</string>
-  <string name="frequentList">經常</string>
-  <string name="ghostData_company">公司</string>
-  <string name="ghostData_email">電子郵件地址</string>
-  <string name="ghostData_im">立即訊息名稱</string>
-  <string name="ghostData_name">姓名</string>
-  <string name="ghostData_notes">我的記事</string>
-  <string name="ghostData_phone">電話號碼</string>
-  <string name="ghostData_postal">郵遞地址</string>
-  <string name="ghostData_title">職位</string>
-  <string name="groupEmpty">\"<xliff:g id="groupName">%s</xliff:g>\" 群組空白。</string>
-  <string name="groupNameMyContacts">我的連絡人</string>
-  <string name="groupNameWithPhones">含有電話號碼的連絡人</string>
-  <string name="imLabelsGroup">立即訊息</string>
-  <string name="imei">IMEI</string>
-  <string name="importFromSim">SIM 卡連絡人匯入工具</string>
-  <string name="insertContactDescription">建立連絡人</string>
-  <string name="invalidContactMessage">此連絡人不存在。</string>
-  <string name="label_company">公司</string>
-  <string name="label_notes">記事</string>
-  <string name="label_ringtone">響鈴音調</string>
-  <string name="label_title">職稱</string>
-  <string name="listSeparatorCallNumber">撥號</string>
-  <string name="listSeparatorMapAddress">地圖地址</string>
-  <string name="listSeparatorOrganizations">組織</string>
-  <string name="listSeparatorOtherInformation">其它資訊</string>
-  <string name="listSeparatorSendEmail">傳送電子郵件</string>
-  <string name="listSeparatorSendIm">傳送立即訊息</string>
-  <string name="listSeparatorSendSmsMms">傳送簡訊/多媒體簡訊</string>
-  <string name="menu_addItem">其它資訊</string>
-  <string name="menu_addStar">加到我的最愛</string>
-  <string name="menu_call">撥號</string>
-  <string name="menu_callNumber">撥打到 <xliff:g id="contact">%s</xliff:g></string>
-  <string name="menu_deleteContact">刪除連絡人</string>
-  <string name="menu_dialer">撥號員</string>
-  <string name="menu_displayGroup">顯示群組</string>
-  <string name="menu_doNotSave">放棄變更</string>
-  <string name="menu_done">儲存</string>
-  <string name="menu_editContact">編輯連絡人</string>
-  <string name="menu_editNumberBeforeCall">撥號之前編輯號碼</string>
-  <string name="menu_makeDefaultNumber">設成預設號碼</string>
-  <string name="menu_newContact">新增連絡人</string>
-  <string name="menu_newFavortie">新增我的最愛</string>
-  <string name="menu_preferences">設定</string>
-  <string name="menu_removeStar">從我的最愛中移除</string>
-  <string name="menu_sendEmail">傳送電子郵件</string>
-  <string name="menu_sendSMS">傳送簡訊/多媒體簡訊</string>
-  <string name="menu_sendTextMessage">傳送簡訊</string>
-  <string name="menu_viewAddress">地圖地址</string>
-  <string name="menu_viewContact">檢視連絡人</string>
-  <string name="noButton">取消</string>
-  <string name="noContacts">無連絡人。</string>
-  <string name="noContactsWithPhoneNumbers">無含有電話號碼的連絡人。</string>
-  <string name="noFavorites">無我的最愛。</string>
-  <string name="no_imei">未知的 IMEI</string>
-  <string name="ok">確定</string>
-  <string name="okButtonText">確定</string>
-  <string name="otherLabelsGroup">其他</string>
-  <string name="phoneIconLabel">電話</string>
-  <string name="phoneLabelsGroup">電話</string>
-  <string name="photoPickerNotFoundText">電話上無可用圖片。</string>
-  <string name="pickerNewContactHeader">建立新連絡人</string>
-  <string name="postalLabelsGroup">郵遞地址</string>
-  <string name="private_num">私人號碼</string>
-  <string name="recentCallsIconLabel">撥號記錄</string>
-  <string name="recentCalls_addToContact">新增到連絡人</string>
-  <string name="recentCalls_callNumber">撥打到 <xliff:g id="who">%s</xliff:g></string>
-  <string name="recentCalls_deleteAll">清除撥號記錄</string>
-  <string name="recentCalls_editNumberBeforeCall">撥號之前編輯號碼</string>
-  <string name="recentCalls_empty">撥號記錄空白。</string>
-  <string name="recentCalls_removeFromRecentList">從撥號記錄中移除</string>
-  <string name="removePicture">移除圖示</string>
-  <string name="searchHint">搜尋連絡人</string>
-  <string name="selectGroupsToSync">同步群組</string>
-  <string name="selectLabel">選取標籤</string>
-  <string name="select_group_title">選取要顯示的群組</string>
-  <string name="send_to_voicemail_checkbox">直接撥號到語音信箱。</string>
-  <string name="send_to_voicemail_view">如此便會直接撥號到語音信箱。</string>
-  <string name="shortcutContact">連絡人</string>
-  <string name="showAllGroups">所有連絡人</string>
-  <string name="showingGroupTitle">
-					<xliff:g id="groupName">%s</xliff:g>
-				</string>
-  <string name="simContacts_emptyLoading">正在從 SIM 卡載入\u2026</string>
-  <string name="simContacts_title">SIM 卡連絡人</string>
-  <string name="sms_entry_label">傳送簡訊/多媒體簡訊</string>
-  <string name="starredList">附加星號</string>
-  <string name="strequentList">我的最愛</string>
-  <string name="syncAllGroups">同步所有連絡人</string>
-  <string name="syncGroupChooserTitle">選取要同步的群組</string>
-  <string name="syncGroupPreference">同步群組</string>
-  <string name="syncGroupPreference_summary">選取要同步的群組</string>
-  <string name="unknown">無法辨識</string>
-  <string name="viewContactDesription">檢視連絡人</string>
-  <string name="viewContactTitle">連絡人詳細資料</string>
-  <string name="voicemail">語音信箱</string>
-  <string name="yesButton">確定</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c09d213..450b3fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,145 +15,203 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Strings for ContactsActivity and tabs -->
+    <!-- Title for the activity that shows contacts -->
     <string name="contactsList">Contacts</string>
+
+    <!-- Name of activity that allows users to create shortcuts on the home screen to a contact.
+         This shows up in a list of things like bookmark, folder, music playlist, etc -->
     <string name="shortcutContact">Contact</string>
+
+    <!-- Title for the activity that shows only starred contacts -->
     <string name="starredList">Starred</string>
+
+    <!-- Title for the activity that shows only frequently contacted contacts -->
     <string name="frequentList">Frequent</string>
+
+    <!-- Title for the activity that shows a mix of starred contacts and frequently contacted
+         contacts. -->
     <string name="strequentList">Favorites</string>
 
     <!-- The title bar when viewing the contact details activity -->
     <string name="viewContactTitle">Contact details</string>
     
-    <!-- Individual contact context menu item -->
+    <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
+         viewing a contact. This string represents the built in way to view the contact. -->
     <string name="viewContactDesription">View contact</string>
     
-    <!-- Individual contact context menu item. The description of the activity that edits a contact -->
+    <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
+         editing a contact. This string represents the built in way to edit the contact. -->
     <string name="editContactDescription">Edit contact</string>
 
-    <!-- The description of the activity that creates a contact -->
+    <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
+         creating a new contact. This string represents the built in way to create the contact. -->
     <string name="insertContactDescription">Create contact</string>
-    <!-- title of drop-down menu after user presses the Search key -->
+
+    <!-- Hint text in the search box when the user hits the Search key while in the contacts app -->
     <string name="searchHint">Search contacts</string>
 
     <!-- Menu item to create a new contact -->
     <string name="menu_newContact">New contact</string>
-    <!-- Menu item to create a new contact that is a "favorite" contact -->
-    <string name="menu_newFavortie">New favorite</string>
-    <string name="menu_dialer">Dialer</string>
-    <!-- Individual contact context menu item. -->
+
+    <!-- Menu item used to view the details for a specific contact -->
     <string name="menu_viewContact">View contact</string>
-    <string name="menu_callNumber">Call <xliff:g id="contact">%s</xliff:g></string>
-    <string name="menu_editNumberBeforeCall">Edit number before call</string>
-    <!-- Individual contact context menu item. -->
+
+    <!-- Menu item used to call a contact, containing the name of the contact to call -->
+    <string name="menu_callNumber">Call <xliff:g id="name">%s</xliff:g></string>
+
+    <!-- Menu item used to add a star to a contact, which makes that contact show up at the top of favorites -->
     <string name="menu_addStar">Add to favorites</string>
-    <!-- Individual contact context menu item. -->
+
+    <!-- Menu item used to remove a star from a contact, making the contact no longer show up at the top of favorites -->
     <string name="menu_removeStar">Remove from favorites</string>
 
-    <!-- Strings for ViewContactActivity. -->
+    <!-- Optional menu item to encode the current contact as a QR Code using Barcode Scanner. -->
+    <string name="menu_showBarcode">Show barcode</string>
+
+    <!-- Menu item used to edit a specific contact -->
     <string name="menu_editContact">Edit contact</string>
-    <!-- Individual contact context menu item & View contact screen menu item. -->
+
+    <!-- Menu item used to delete a specific contact -->
     <string name="menu_deleteContact">Delete contact</string>
+
+    <!-- Menu item used to call a specific contact when viewing the details of that contact. -->
     <string name="menu_call">Call</string>
+
+    <!-- Menu item used to send an SMS or MMS message to a specific phone number or a contacts default phone number -->
     <string name="menu_sendSMS">Send SMS/MMS</string>
-    <!-- Email address context menu item. -->
+
+    <!-- Menu item used to send an email message to a specific email address -->
     <string name="menu_sendEmail">Send email</string>
-    <!-- Physical address context menu item. -->
+
+    <!-- Menu item used to view a contact's address on a map -->
     <string name="menu_viewAddress">Map address</string>
-    <!-- Phone number context menu item. -->
+
+    <!-- Menu item that makes a phone the default for a contact. The default number used when you
+         try to call a contact without specifying a specific number. -->
     <string name="menu_makeDefaultNumber">Make default number</string>
-    <!-- Confirmation dialog after users selects to delete a contact. -->
+
+    <!-- Confirmation dialog title after users selects to delete a contact. -->
     <string name="deleteConfirmation_title">Delete</string>
+
+    <!-- Confirmation dialog contents after users selects to delete a contact. -->
     <string name="deleteConfirmation">This contact will be deleted.</string>
-    <string name="yesButton">OK</string>
-    <string name="noButton">Cancel</string>
 
-    <!-- The label next to phone numbers in the contact details screen when clicking the number
-         will send an SMS to it. 
-    -->
-    <string name="sms_entry_label">Send SMS/MMS</string>
-
-    <!-- Strings for EditContact screen -->
+    <!-- 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>
+
+    <!-- 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>
+
+    <!-- The title of the activity that creates a new contact -->
     <string name="editContact_title_insert">New contact</string>
 
+    <!-- Button that adds more info to a contact, like a new phone number, email address, or postal address -->
     <string name="menu_addItem">More info</string>
 
-    <string name="label_company">Company</string>
-    <string name="label_title">Job title</string>
+    <!-- The label describing the Notes field of a contact. This field allows free form text entry about a contact -->
     <string name="label_notes">Notes</string>
+
+    <!-- The label describing the custom ringtone for a contact -->
     <string name="label_ringtone">Ringtone</string>
-    <!-- Ghost data that appears in the field by default in light font. -->
+
+    <!-- Hint text for the contact name when editing -->
     <string name="ghostData_name">First and Last</string>
+
+    <!-- Hint text for the organization name when editing -->
     <string name="ghostData_company">Company</string>
+
+    <!-- Hint text for the organization position when editing -->
     <string name="ghostData_title">Position</string>
+
+    <!-- Hint text for an IM account when editing -->
     <string name="ghostData_im">IM name</string>
+
+    <!-- Hint text for the notes field when editing -->
     <string name="ghostData_notes">My note</string>
+
+    <!-- Hint text for the phone number field when editing -->
     <string name="ghostData_phone">Phone number</string>
+
+    <!-- Hint text for the email address field when editing -->
     <string name="ghostData_email">Email address</string>
+
+    <!-- Hint text for the postal address field when editing -->
     <string name="ghostData_postal">Postal address</string>
 
     <!-- Message displayed in a toast when you try to view the details of a contact that
          for some reason doesn't exist anymore. -->
     <string name="invalidContactMessage">The contact does not exist.</string>
 
+    <!-- When picking a contact from a list of all contacts there is an entry at the top of the
+         list that allows the user to create a new contact, which this string is used for -->
     <string name="pickerNewContactHeader">Create new contact</string>
-    <!-- New contact screen, dialog title when you select a label. -->
+
+    <!-- Dialog title when you select a label when creating or edit a contact -->
     <string name="selectLabel">Select label</string>
 
+    <!-- Header that expands to list all of the types of phone numbers when editing or creating a phone number for a contact -->
     <string name="phoneLabelsGroup">Phone</string>
+
+    <!-- Header that expands to list all of the types of email addresses when editing or creating an email address for a contact -->
     <string name="emailLabelsGroup">Email</string>
+
+    <!-- Header that expands to list all of the types of IM account when editing or creating an IM account for a contact -->
     <string name="imLabelsGroup">IM</string>
+
+    <!-- Header that expands to list all of the types of postal addresses when editing or creating an postal address for a contact -->
     <string name="postalLabelsGroup">Postal address</string>
+
+    <!-- Header that expands to list other types of data you can add to a contact, like notes and organizations -->
     <string name="otherLabelsGroup">Other</string>
 
+    <!-- The order of the items below is important, don't reorder without changing EditContactActivity.java -->
+    <skip/>
+    <!-- The labels that are under the otherLabelsGroup when editing a contact. -->
     <string-array name="otherLabels">
-        <!-- The order of these is important, don't reorder without changing EditContactActivity.java -->
+        <!-- An organization associated with a contact -->
         <item>Organization</item>
+        <!-- A note associated with a contact -->
         <item>Note</item>
     </string-array>
 
-
-    <!-- Dialog that appears if there are no pictures from which to create an icon -->
+    <!-- Title of the dialog that appears if there are no pictures from which to create an icon for a contact -->
     <string name="errorDialogTitle">No pictures</string>
-    <string name="photoPickerNotFoundText">No pictures are available on the phone.</string>
-    <string name="okButtonText">OK</string>
-    <string name="cancelButtonText">Cancel</string>
 
-    <!-- Strings for AttachImage. -->
+    <!-- Description in the dialog that appears if there are no pictures from which to create an icon for a contact -->
+    <string name="photoPickerNotFoundText">No pictures are available on the phone.</string>
+
+    <!-- Description of the activity used to set a photo in the pictures application as the icon for a contact -->
     <string name="attachToContact">Contact icon</string>
 
-    <!-- unreviewed strings -->
-    <string name="customLabelPickerTitle">Custom label</string>
-    <!-- The menu item to open the preferences -->
-    <string name="menu_preferences">Settings</string>
+    <!-- Title of the dialog used to set a custom label for a contact detail, like a phone number or email address.
+         For example, this may be used to set a phone number's label to "Vaction house" -->
+    <string name="customLabelPickerTitle">Custom label name</string>
+
     <!-- The menu item to open the list of groups to display -->
     <string name="menu_displayGroup">Display group</string>
 
-    <!-- The title of the preference to display which groups to sync -->
-    <string name="syncGroupPreference">Sync groups</string>
-    <!-- The summary of the preference to choose sync groups. -->
-    <string name="syncGroupPreference_summary">Select groups to synchronize</string>
+    <!-- The menu item that leads to the settings for contact syncing -->
+    <string name="syncGroupPreference">Edit sync groups</string>
     
-    <!-- The description of the preference that launches the SIM import activity -->
-    <string name="importFromSim">SIM contacts importer</string>
+    <!-- The menu item that launches the SIM card import activity -->
+    <string name="importFromSim">Import contacts</string>
 
-    <!-- Characters that are used for each of the fast-scroll widget that skips directly
-         to names starting with this letter.  If your language sorts differently than this,
-         please rearrange the alphabet here to be whatever is correct (e.g. Norwegian
-         has the three additional letters at the end). -->
-    <string name="alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
-    <!-- New contact screen, check box label. -->
+    <!-- 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>
-    <!-- View contact screen, string identifying state. -->
+
+    <!-- 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>
-    <!-- New contact screen, default ringtone value. -->
+
+    <!-- String used to indicate that a contact doesn't have a custom ringtone -->
     <string name="default_ringtone">Default</string>
 
     <!-- The button/menu item that allows you to add a picture to a contact -->
@@ -171,16 +229,11 @@
     <!-- The text displayed when the contacts list is empty while displaying favorite contacts -->
     <string name="noFavorites">No favorites.</string>
 
-    <!-- Title for group selection menu -->
-    <string name="select_group_title">Select group to display</string>
+    <!-- Title for group selection dialog. The dialog contains a list of contact groups that the
+         user can pick from, indicating they only want to see the contacts in that group. -->
+    <string name="select_group_title">Groups</string>
     
-    <!-- Group name for all contacts -->
-    <string name="allContacts">All contacts</string>
-    
-    <!-- Title for Contacts group that is currently showing -->
-    <string name="showingGroupTitle"><xliff:g id="groupName">%s</xliff:g></string>
-    
-    <!-- The text displayed when the contacts list is empty while displaying a single group -->
+    <!-- The text displayed when the contacts list is empty while displaying a single group of contacts -->
     <string name="groupEmpty">Your \"<xliff:g id="groupName">%s</xliff:g>\" group is empty.</string>
 
     <!-- The description of all groups when asking the user what they want to display -->
@@ -195,12 +248,6 @@
     <!-- The group type that displays only contacts with phone numbers -->
     <string name="groupNameWithPhones">Contacts with phone numbers</string>
     
-    <!-- Title of the dialog the user uses to choose which contacts groups to sync from the server -->
-    <string name="syncGroupChooserTitle">Select groups to sync</string>
-
-    <!-- The menu item allowing you to select which groups you want to sync. -->
-    <string name="selectGroupsToSync">Sync groups</string>
-
     <!-- Toast displayed when a contact is created -->
     <string name="contactCreatedToast">Contact created.</string>
     
@@ -228,43 +275,106 @@
     <!-- 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>
 
-
-
-    <!-- Launcher tab labels -->
+    <!-- The description text for the contacts tab. Space is limited for this string, so the shorter the better -->
     <string name="contactsIconLabel">Contacts</string>
-    <string name="contactsFavoritesLabel">Favorites</string>
-    <string name="dialerIconLabel">Dialer</string>
-    <string name="phoneIconLabel">Phone</string>
-    <string name="recentCallsIconLabel">Call log</string>
 
-    <!-- menu items for Dialer  -->
+    <!-- The description text for the favorites tab. Space is limited for this string, so the shorter the better -->
+    <string name="contactsFavoritesLabel">Favorites</string>
+
+    <!-- The description text for the dialer tab. Space is limited for this string, so the shorter the better -->
+    <string name="dialerIconLabel">Dialer</string>
+
+    <!-- The description text for the call log tab. Space is limited for this string, so the shorter the better -->
+    <string name="recentCallsIconLabel">Call log</string>
+    <string name="liveFolderAll">All contacts</string>
+    <string name="liveFolderFavorites">Starred contacts</string>
+    <string name="liveFolderPhone">Contacts with phone numbers</string>
+
+    <!-- Menu item used to send an SMS or MMS message to a phone number  -->
     <string name="menu_sendTextMessage">Send SMS message</string>
 
-    <!-- Recent calls strings -->
-    <string name="recentCalls_callNumber">Call <xliff:g id="who">%s</xliff:g></string>
+    <!-- Menu item used to call a contact from the call log -->
+    <string name="recentCalls_callNumber">Call <xliff:g id="name">%s</xliff:g></string>
+
+    <!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
     <string name="recentCalls_editNumberBeforeCall">Edit number before call</string>
+
+    <!-- Menu item used to add a number from the call log to contacts -->
     <string name="recentCalls_addToContact">Add to contacts</string>
+
+    <!-- Menu item used to remove a single call from the call log -->
     <string name="recentCalls_removeFromRecentList">Remove from call log</string>
+
+    <!-- Menu item used to remove all calls from the call log -->
     <string name="recentCalls_deleteAll">Clear call log</string>
+
+    <!-- Text displayed when the call log is empty -->
     <string name="recentCalls_empty">Call log is empty.</string>
 
-    <!-- IMEI strings -->
+    <!-- The title of a dialog that displays the IMEI of the phone -->
     <string name="imei">IMEI</string>
-    <string name="no_imei">Unknown IMEI</string>
 
-    <string name="doneButton">Done</string>
-
-    <string name="ok">OK</string>
-
+    <!-- String used for displaying calls to the voicemail number in the call log -->
     <string name="voicemail">Voicemail</string>
+
+    <!-- String used to display calls from unknown numbers in the call log -->
     <string name="unknown">Unknown</string>
+
+    <!-- String used to display calls from private numbers in the call log -->
     <string name="private_num">Private number</string>
 
     <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
          to dial using the physical keyboard -->
     <string name="dialerKeyboardHintText">Use keyboard to dial</string>
 
-    <!-- ADN related strings -->
+    <!-- Hint text displayed in the "digits" field above the dialer's
+         dialpad, if there's already a call in progress.  (This hint
+         reminds the user that the dialer will add a new call, as opposed
+         to sending DTMF tones over the current call.) -->
+    <string name="dialerDialpadHintText">Dial to add a call</string>
+
+    <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial -->
     <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
+
+    <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial -->
     <string name="simContacts_title">SIM card contacts</string>
+
+    <!-- Displayed when a user is prompted to setup a Google account for syncing -->
+    <string name="contactsSyncPlug"><font fgcolor="#ffffffff">Sync your Google contacts!</font>
+    \nAfter syncing to your phone, your contacts will be available to you wherever you go.</string>
+
+    <!-- Displayed full screen when the user has no contacts and they are displaying the My Contacts group -->
+    <string name="noContactsHelpText">"You don't have any contacts.\n\nTo add contacts, press <font fgcolor="#ffffffff"><b>Menu</b></font> and select:\n
+        \n<li><font fgcolor="#ffffffff"><b>Edit sync groups</b></font> to add from a new or existing Google account\n</li>
+        \n<li><font fgcolor="#ffffffff"><b>New contact</b></font> to create a new contact from scratch\n</li>
+        \n<li><font fgcolor="#ffffffff"><b>Import contacts</b></font> to add contacts from your SIM card\n</li>"
+    </string>
+    
+    <!-- Activity title for the activity that lets the user choose which groups of contacts to sync from the server -->
+    <string name="seclectSyncGroups_title">Select groups to sync</string>
+
+    <!-- Live folder label for all contacts -->
+    <string name="liveFolder_all_label">All Contacts</string>
+
+    <!-- Live folder label for only starred contacts -->
+    <string name="liveFolder_favorites_label">Starred</string>
+
+    <!-- Live folder label for all contacts with phone numbers -->
+    <string name="liveFolder_phones_label">Phones</string>    
+
+    <!-- Item label: jump to the in-call DTMF dialpad.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_useDtmfDialpad">Use touch tone keypad</string>
+
+    <!-- Item label: jump to the in-call UI.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+
+    <!-- Item label: use the Dialer's dialpad to add another call.
+         (Part of a list of options shown in the dialer when another call
+         is already in progress.) -->
+    <string name="dialer_addAnotherCall">Add call</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
deleted file mode 100644
index 0648441..0000000
--- a/res/values/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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>
-    <style name="TextAppearance.DialerLine1" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">32sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.DialerLine2" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-    </style>
-</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
deleted file mode 100644
index dd18137..0000000
--- a/res/xml/preferences.xml
+++ /dev/null
@@ -1,41 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceScreen
-            android:key="sync_groups"
-            android:title="@string/syncGroupPreference"
-            android:summary="@string/syncGroupPreference_summary">
-        <intent
-                android:action="android.intent.action.VIEW"
-                android:targetPackage="com.android.contacts"
-                android:targetClass="com.android.contacts.ContactsGroupSyncSelector"
-        />
-    </PreferenceScreen>
-
-    <PreferenceScreen
-        android:title="@string/importFromSim"
-    >
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:mimeType="vnd.android.cursor.item/sim-contact"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.SimContacts"
-        />
-    </PreferenceScreen>
-</PreferenceScreen>