Merge "Import translations. DO NOT MERGE"
diff --git a/res-common/layout/contact_tile_frequent.xml b/res-common/layout/contact_tile_frequent.xml
index 880ce81..b1e83ce 100644
--- a/res-common/layout/contact_tile_frequent.xml
+++ b/res-common/layout/contact_tile_frequent.xml
@@ -24,8 +24,6 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
- android:paddingStart="?list_item_padding_left"
- android:paddingEnd="?list_item_padding_right"
android:paddingTop="?list_item_padding_top"
android:paddingBottom="?list_item_padding_bottom">
diff --git a/res-common/layout/contact_tile_starred.xml b/res-common/layout/contact_tile_starred.xml
index 3d9abb5..834cdc8 100644
--- a/res-common/layout/contact_tile_starred.xml
+++ b/res-common/layout/contact_tile_starred.xml
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingTop="21dp">
+ android:paddingTop="24dp">
<view
android:id="@+id/contact_tile_container"
android:layout_width="match_parent"
diff --git a/res-common/layout/list_separator.xml b/res-common/layout/list_separator.xml
index 97e154b..bb9f1d4 100644
--- a/res-common/layout/list_separator.xml
+++ b/res-common/layout/list_separator.xml
@@ -24,4 +24,4 @@
android:paddingBottom="15dip"
android:paddingTop="16dip"
android:textStyle="bold"
- android:textSize="20sp"/>
+ android:textSize="24sp"/>
diff --git a/res-common/mipmap-hdpi/ic_contacts_clr_48cv_44dp.png b/res-common/mipmap-hdpi/ic_contacts_clr_48cv_44dp.png
new file mode 100644
index 0000000..64eff00
--- /dev/null
+++ b/res-common/mipmap-hdpi/ic_contacts_clr_48cv_44dp.png
Binary files differ
diff --git a/res-common/mipmap-hdpi/ic_launcher_contacts.png b/res-common/mipmap-hdpi/ic_launcher_contacts.png
deleted file mode 100644
index e0136f6..0000000
--- a/res-common/mipmap-hdpi/ic_launcher_contacts.png
+++ /dev/null
Binary files differ
diff --git a/res-common/mipmap-mdpi/ic_contacts_clr_48cv_44dp.png b/res-common/mipmap-mdpi/ic_contacts_clr_48cv_44dp.png
new file mode 100644
index 0000000..b4ee821
--- /dev/null
+++ b/res-common/mipmap-mdpi/ic_contacts_clr_48cv_44dp.png
Binary files differ
diff --git a/res-common/mipmap-mdpi/ic_launcher_contacts.png b/res-common/mipmap-mdpi/ic_launcher_contacts.png
deleted file mode 100644
index 3d490c3..0000000
--- a/res-common/mipmap-mdpi/ic_launcher_contacts.png
+++ /dev/null
Binary files differ
diff --git a/res-common/mipmap-xhdpi/ic_contacts_clr_48cv_44dp.png b/res-common/mipmap-xhdpi/ic_contacts_clr_48cv_44dp.png
new file mode 100644
index 0000000..6feeadf
--- /dev/null
+++ b/res-common/mipmap-xhdpi/ic_contacts_clr_48cv_44dp.png
Binary files differ
diff --git a/res-common/mipmap-xhdpi/ic_launcher_contacts.png b/res-common/mipmap-xhdpi/ic_launcher_contacts.png
deleted file mode 100644
index dde3cbb..0000000
--- a/res-common/mipmap-xhdpi/ic_launcher_contacts.png
+++ /dev/null
Binary files differ
diff --git a/res-common/mipmap-xxhdpi/ic_contacts_clr_48cv_44dp.png b/res-common/mipmap-xxhdpi/ic_contacts_clr_48cv_44dp.png
new file mode 100644
index 0000000..01a3fde
--- /dev/null
+++ b/res-common/mipmap-xxhdpi/ic_contacts_clr_48cv_44dp.png
Binary files differ
diff --git a/res-common/mipmap-xxhdpi/ic_launcher_contacts.png b/res-common/mipmap-xxhdpi/ic_launcher_contacts.png
deleted file mode 100644
index 99b403b..0000000
--- a/res-common/mipmap-xxhdpi/ic_launcher_contacts.png
+++ /dev/null
Binary files differ
diff --git a/res-common/mipmap-xxxhdpi/ic_contacts_clr_48cv_44dp.png b/res-common/mipmap-xxxhdpi/ic_contacts_clr_48cv_44dp.png
new file mode 100644
index 0000000..328e067
--- /dev/null
+++ b/res-common/mipmap-xxxhdpi/ic_contacts_clr_48cv_44dp.png
Binary files differ
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index b5171ec..6cf20a5 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -222,9 +222,9 @@
<!-- Field title for the full name of a contact [CHAR LIMIT=64]-->
<string name="full_name">Name</string>
<!-- Field title for the given name of a contact -->
- <string name="name_given">Given name</string>
+ <string name="name_given">First name</string>
<!-- Field title for the family name of a contact -->
- <string name="name_family">Family name</string>
+ <string name="name_family">Last name</string>
<!-- Field title for the prefix name of a contact -->
<string name="name_prefix">Name prefix</string>
<!-- Field title for the middle name of a contact -->
@@ -236,11 +236,11 @@
<string name="name_phonetic">Phonetic name</string>
<!-- Field title for the phonetic given name of a contact -->
- <string name="name_phonetic_given">Phonetic given name</string>
+ <string name="name_phonetic_given">Phonetic first name</string>
<!-- Field title for the phonetic middle name of a contact -->
<string name="name_phonetic_middle">Phonetic middle name</string>
<!-- Field title for the phonetic family name of a contact -->
- <string name="name_phonetic_family">Phonetic family name</string>
+ <string name="name_phonetic_family">Phonetic last name</string>
<!-- Header that expands to list all of the types of phone numbers when editing or creating a
phone number for a contact [CHAR LIMIT=20] -->
@@ -657,23 +657,23 @@
<!-- Contact preferences related strings -->
- <!-- Label of the "sort list by" display option -->
- <string name="display_options_sort_list_by">Sort list by</string>
+ <!-- Label of the "sort by" display option -->
+ <string name="display_options_sort_list_by">Sort by</string>
<!-- An allowable value for the "sort list by" contact display option -->
- <string name="display_options_sort_by_given_name">Given name</string>
+ <string name="display_options_sort_by_given_name">First name</string>
<!-- An allowable value for the "sort list by" contact display option -->
- <string name="display_options_sort_by_family_name">Family name</string>
+ <string name="display_options_sort_by_family_name">Last name</string>
- <!-- Label of the "view names as" display option [CHAR LIMIT=64]-->
- <string name="display_options_view_names_as">View contact names</string>
+ <!-- Label of the "name format" display option [CHAR LIMIT=64]-->
+ <string name="display_options_view_names_as">Name format</string>
<!-- An allowable value for the "view names as" contact display option -->
- <string name="display_options_view_given_name_first">Given name first</string>
+ <string name="display_options_view_given_name_first">First name first</string>
<!-- An allowable value for the "view names as" contact display option -->
- <string name="display_options_view_family_name_first">Family name first</string>
+ <string name="display_options_view_family_name_first">Last name first</string>
<!-- Action that shares visible contacts -->
<string name="share_visible_contacts">Share visible contacts</string>
