am 1761da14: Merge "Track changes to libphonenumber."
* commit '1761da144b02e90caa9bb45a6b2f9903f2a9f836':
Track changes to libphonenumber.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54fce69..d23e74a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,6 +21,7 @@
<original-package android:name="com.android.contacts" />
<uses-permission android:name="android.permission.CALL_PHONE" />
+ <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
@@ -221,7 +222,7 @@
<activity
android:name=".activities.ShowOrCreateActivity"
android:label="@string/launcherActivityLabel"
- android:theme="@android:style/Theme.Translucent.NoTitleBar">
+ android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
<intent-filter>
<action android:name="com.android.contacts.action.SHOW_OR_CREATE_CONTACT" />
diff --git a/res/drawable-hdpi/account_spinner_icon.png b/res/drawable-hdpi/account_spinner_icon.png
deleted file mode 100644
index 9566386..0000000
--- a/res/drawable-hdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_account_circle_black_24dp.png b/res/drawable-hdpi/ic_account_circle_black_24dp.png
new file mode 100644
index 0000000..ba5a509
--- /dev/null
+++ b/res/drawable-hdpi/ic_account_circle_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_business_black_24dp.png b/res/drawable-hdpi/ic_business_black_24dp.png
new file mode 100644
index 0000000..fa069ab
--- /dev/null
+++ b/res/drawable-hdpi/ic_business_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_camera_alt_black_24dp.png b/res/drawable-hdpi/ic_camera_alt_black_24dp.png
new file mode 100644
index 0000000..4978a3a
--- /dev/null
+++ b/res/drawable-hdpi/ic_camera_alt_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_circles_extended_black_24dp.png b/res/drawable-hdpi/ic_circles_extended_black_24dp.png
new file mode 100644
index 0000000..8973e89
--- /dev/null
+++ b/res/drawable-hdpi/ic_circles_extended_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/res/drawable-hdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..4a9f769
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_group_work_black_24dp.png b/res/drawable-hdpi/ic_group_work_black_24dp.png
new file mode 100644
index 0000000..664f07a
--- /dev/null
+++ b/res/drawable-hdpi/ic_group_work_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_insert_comment_black_24dp.png b/res/drawable-hdpi/ic_insert_comment_black_24dp.png
new file mode 100644
index 0000000..d472658
--- /dev/null
+++ b/res/drawable-hdpi/ic_insert_comment_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_people_black_24dp.png b/res/drawable-hdpi/ic_people_black_24dp.png
new file mode 100644
index 0000000..10c46a9
--- /dev/null
+++ b/res/drawable-hdpi/ic_people_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_person_black_24dp.png b/res/drawable-hdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000..2eeb7c6
--- /dev/null
+++ b/res/drawable-hdpi/ic_person_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_public_black_24dp.png b/res/drawable-hdpi/ic_public_black_24dp.png
new file mode 100644
index 0000000..e3cdeb4
--- /dev/null
+++ b/res/drawable-hdpi/ic_public_black_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/panel_message.9.png b/res/drawable-hdpi/panel_message.9.png
deleted file mode 100644
index caa3f60..0000000
--- a/res/drawable-hdpi/panel_message.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/account_spinner_icon.png b/res/drawable-ldrtl-hdpi/account_spinner_icon.png
deleted file mode 100644
index ec1f267..0000000
--- a/res/drawable-ldrtl-hdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/account_spinner_icon.png b/res/drawable-ldrtl-mdpi/account_spinner_icon.png
deleted file mode 100644
index 11b1a3e..0000000
--- a/res/drawable-ldrtl-mdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/account_spinner_icon.png b/res/drawable-ldrtl-xhdpi/account_spinner_icon.png
deleted file mode 100644
index 2c1c59f..0000000
--- a/res/drawable-ldrtl-xhdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/account_spinner_icon.png b/res/drawable-mdpi/account_spinner_icon.png
deleted file mode 100644
index e159d59..0000000
--- a/res/drawable-mdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_account_circle_black_24dp.png b/res/drawable-mdpi/ic_account_circle_black_24dp.png
new file mode 100644
index 0000000..0c1202d
--- /dev/null
+++ b/res/drawable-mdpi/ic_account_circle_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_business_black_24dp.png b/res/drawable-mdpi/ic_business_black_24dp.png
new file mode 100644
index 0000000..1c54f8b
--- /dev/null
+++ b/res/drawable-mdpi/ic_business_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_camera_alt_black_24dp.png b/res/drawable-mdpi/ic_camera_alt_black_24dp.png
new file mode 100644
index 0000000..90dd073
--- /dev/null
+++ b/res/drawable-mdpi/ic_camera_alt_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_circles_extended_black_24dp.png b/res/drawable-mdpi/ic_circles_extended_black_24dp.png
new file mode 100644
index 0000000..e851532
--- /dev/null
+++ b/res/drawable-mdpi/ic_circles_extended_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/res/drawable-mdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..e2f5f35
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_group_work_black_24dp.png b/res/drawable-mdpi/ic_group_work_black_24dp.png
new file mode 100644
index 0000000..7182a32
--- /dev/null
+++ b/res/drawable-mdpi/ic_group_work_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_insert_comment_black_24dp.png b/res/drawable-mdpi/ic_insert_comment_black_24dp.png
new file mode 100644
index 0000000..3a2bda7
--- /dev/null
+++ b/res/drawable-mdpi/ic_insert_comment_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_people_black_24dp.png b/res/drawable-mdpi/ic_people_black_24dp.png
new file mode 100644
index 0000000..807f174
--- /dev/null
+++ b/res/drawable-mdpi/ic_people_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_person_black_24dp.png b/res/drawable-mdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000..8c415b9
--- /dev/null
+++ b/res/drawable-mdpi/ic_person_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_public_black_24dp.png b/res/drawable-mdpi/ic_public_black_24dp.png
new file mode 100644
index 0000000..b18b4ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_public_black_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/panel_message.9.png b/res/drawable-mdpi/panel_message.9.png
deleted file mode 100644
index de74565..0000000
--- a/res/drawable-mdpi/panel_message.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/account_spinner_icon.png b/res/drawable-xhdpi/account_spinner_icon.png
deleted file mode 100644
index d3d3cac..0000000
--- a/res/drawable-xhdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_account_circle_black_24dp.png b/res/drawable-xhdpi/ic_account_circle_black_24dp.png
new file mode 100644
index 0000000..f26b201
--- /dev/null
+++ b/res/drawable-xhdpi/ic_account_circle_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_business_black_24dp.png b/res/drawable-xhdpi/ic_business_black_24dp.png
new file mode 100644
index 0000000..9e3b9b8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_business_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_camera_alt_black_24dp.png b/res/drawable-xhdpi/ic_camera_alt_black_24dp.png
new file mode 100644
index 0000000..8522251
--- /dev/null
+++ b/res/drawable-xhdpi/ic_camera_alt_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_circles_extended_black_24dp.png b/res/drawable-xhdpi/ic_circles_extended_black_24dp.png
new file mode 100644
index 0000000..e87e928
--- /dev/null
+++ b/res/drawable-xhdpi/ic_circles_extended_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/res/drawable-xhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..388b5b0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_group_work_black_24dp.png b/res/drawable-xhdpi/ic_group_work_black_24dp.png
new file mode 100644
index 0000000..8445277
--- /dev/null
+++ b/res/drawable-xhdpi/ic_group_work_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_insert_comment_black_24dp.png b/res/drawable-xhdpi/ic_insert_comment_black_24dp.png
new file mode 100644
index 0000000..3ddd56b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_insert_comment_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_people_black_24dp.png b/res/drawable-xhdpi/ic_people_black_24dp.png
new file mode 100644
index 0000000..1b90bed
--- /dev/null
+++ b/res/drawable-xhdpi/ic_people_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_person_black_24dp.png b/res/drawable-xhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000..ec56af9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_person_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_public_black_24dp.png b/res/drawable-xhdpi/ic_public_black_24dp.png
new file mode 100644
index 0000000..a3ab24c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_public_black_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/panel_message.9.png b/res/drawable-xhdpi/panel_message.9.png
deleted file mode 100644
index 30a7bc3..0000000
--- a/res/drawable-xhdpi/panel_message.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/account_spinner_icon.png b/res/drawable-xxhdpi/account_spinner_icon.png
deleted file mode 100644
index 5f90fbc..0000000
--- a/res/drawable-xxhdpi/account_spinner_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_account_circle_black_24dp.png b/res/drawable-xxhdpi/ic_account_circle_black_24dp.png
new file mode 100644
index 0000000..3cc0a63
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_account_circle_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_business_black_24dp.png b/res/drawable-xxhdpi/ic_business_black_24dp.png
new file mode 100644
index 0000000..85ddede
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_business_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_camera_alt_black_24dp.png b/res/drawable-xxhdpi/ic_camera_alt_black_24dp.png
new file mode 100644
index 0000000..fe8974e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_camera_alt_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_circles_extended_black_24dp.png b/res/drawable-xxhdpi/ic_circles_extended_black_24dp.png
new file mode 100644
index 0000000..ec09d57
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_circles_extended_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/res/drawable-xxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..3fcdfdb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_group_work_black_24dp.png b/res/drawable-xxhdpi/ic_group_work_black_24dp.png
new file mode 100644
index 0000000..0cd03cf
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_group_work_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_insert_comment_black_24dp.png b/res/drawable-xxhdpi/ic_insert_comment_black_24dp.png
new file mode 100644
index 0000000..3039cc1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_insert_comment_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_people_black_24dp.png b/res/drawable-xxhdpi/ic_people_black_24dp.png
new file mode 100644
index 0000000..e4ccc75
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_people_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_person_black_24dp.png b/res/drawable-xxhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000..89e8264
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_person_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_public_black_24dp.png b/res/drawable-xxhdpi/ic_public_black_24dp.png
new file mode 100644
index 0000000..c7d17e3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_public_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_account_circle_black_24dp.png b/res/drawable-xxxhdpi/ic_account_circle_black_24dp.png
new file mode 100644
index 0000000..c6b56c3
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_account_circle_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_business_black_24dp.png b/res/drawable-xxxhdpi/ic_business_black_24dp.png
new file mode 100644
index 0000000..bc3b7bc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_business_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_camera_alt_black_24dp.png b/res/drawable-xxxhdpi/ic_camera_alt_black_24dp.png
new file mode 100644
index 0000000..bda927d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_camera_alt_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_circles_extended_black_24dp.png b/res/drawable-xxxhdpi/ic_circles_extended_black_24dp.png
new file mode 100644
index 0000000..d994a32
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_circles_extended_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..8d322aa
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_group_work_black_24dp.png b/res/drawable-xxxhdpi/ic_group_work_black_24dp.png
new file mode 100644
index 0000000..632387a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_group_work_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_insert_comment_black_24dp.png b/res/drawable-xxxhdpi/ic_insert_comment_black_24dp.png
new file mode 100644
index 0000000..7e795f8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_insert_comment_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_people_black_24dp.png b/res/drawable-xxxhdpi/ic_people_black_24dp.png
new file mode 100644
index 0000000..b72b2f5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_people_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_person_black_24dp.png b/res/drawable-xxxhdpi/ic_person_black_24dp.png
new file mode 100644
index 0000000..3b55aa1
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_person_black_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_public_black_24dp.png b/res/drawable-xxxhdpi/ic_public_black_24dp.png
new file mode 100644
index 0000000..67aaffd
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_public_black_24dp.png
Binary files differ
diff --git a/res/drawable/ic_close_lt.xml b/res/drawable/ic_close_lt.xml
new file mode 100644
index 0000000..178b8a0
--- /dev/null
+++ b/res/drawable/ic_close_lt.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_close_dk"
+ android:autoMirrored="true"
+ android:tint="@android:color/black" />
\ No newline at end of file
diff --git a/res/layout-sw600dp-land/contact_editor_activity.xml b/res/layout-sw600dp-land/contact_editor_activity.xml
index 5c405d5..4eb2d0c 100644
--- a/res/layout-sw600dp-land/contact_editor_activity.xml
+++ b/res/layout-sw600dp-land/contact_editor_activity.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<!-- This should be kept in sync with layout-sw720dp/contact_editor_activity.xml -->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -30,19 +31,19 @@
<View
android:layout_height="match_parent"
android:layout_width="0dip"
- android:layout_weight="2" />
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
<fragment class="com.android.contacts.editor.ContactEditorFragment"
android:id="@+id/contact_editor_fragment"
android:layout_width="0dip"
- android:layout_weight="6"
+ android:layout_weight="@integer/contact_list_card_layout_weight"
android:layout_height="match_parent"/>
<!-- Empty view to represent the right margin -->
<View
android:layout_height="match_parent"
android:layout_width="0dip"
- android:layout_weight="2" />
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
</LinearLayout>
diff --git a/res/layout-sw600dp/contact_editor_fragment.xml b/res/layout-sw600dp/contact_editor_fragment.xml
index 2c6e1f1..be7723d 100644
--- a/res/layout-sw600dp/contact_editor_fragment.xml
+++ b/res/layout-sw600dp/contact_editor_fragment.xml
@@ -19,7 +19,8 @@
xmlns:ex="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/panel_message">
+ android:background="@color/contact_all_list_background_color"
+ android:elevation="@dimen/contact_list_card_elevation">
<LinearLayout
android:id="@+id/editors"
diff --git a/res/layout-sw600dp/text_fields_editor_view.xml b/res/layout-sw600dp/text_fields_editor_view.xml
deleted file mode 100644
index c6b010b..0000000
--- a/res/layout-sw600dp/text_fields_editor_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<com.android.contacts.editor.TextFieldsEditorView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="horizontal"
- android:gravity="center_vertical">
-
- <include
- android:id="@+id/editors"
- layout="@layout/edit_field_list" />
-
- <include
- android:id="@+id/expansion_view_container"
- layout="@layout/edit_expansion_view"
- android:visibility="gone" />
-
- <include
- android:id="@+id/spinner"
- layout="@layout/edit_spinner"
- android:visibility="gone" />
-
- <include
- android:id="@+id/delete_button_container"
- layout="@layout/edit_delete_button"
- android:visibility="gone" />
-
- </LinearLayout>
-
-</com.android.contacts.editor.TextFieldsEditorView>
diff --git a/res/layout-sw720dp/contact_editor_activity.xml b/res/layout-sw720dp/contact_editor_activity.xml
new file mode 100644
index 0000000..b31171f
--- /dev/null
+++ b/res/layout-sw720dp/contact_editor_activity.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- This should be kept in sync with layout-sw600dp-land/contact_editor_activity.xml -->
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:baselineAligned="false">
+
+ <!-- Empty view to represent the left margin -->
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
+
+ <fragment class="com.android.contacts.editor.ContactEditorFragment"
+ android:id="@+id/contact_editor_fragment"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_card_layout_weight"
+ android:layout_height="match_parent"/>
+
+ <!-- Empty view to represent the right margin -->
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
+
+ </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/contact_editor_accounts_changed_activity_with_text.xml b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
index 33714ea..f608f84 100644
--- a/res/layout/contact_editor_accounts_changed_activity_with_text.xml
+++ b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
@@ -39,6 +39,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:measureWithLargestChild="true"
+ android:baselineAligned="false"
style="?android:attr/buttonBarStyle">
<Button
diff --git a/res/layout/edit_date_picker.xml b/res/layout/edit_date_picker.xml
index e2c4278..16bc5be 100644
--- a/res/layout/edit_date_picker.xml
+++ b/res/layout/edit_date_picker.xml
@@ -16,19 +16,12 @@
-->
<!-- Button to select a date in the contact editor. -->
-
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/date_view"
style="@style/SpinnerButtonStyle"
- android:layout_width="0dip"
+ android:layout_width="match_parent"
android:layout_height="@dimen/editor_min_line_item_height"
android:layout_weight="1"
- android:gravity="center_vertical"
- android:layout_marginLeft="@dimen/editor_field_left_padding"
- android:layout_marginRight="@dimen/editor_field_right_padding"
- android:layout_marginStart="@dimen/editor_field_left_padding"
- android:layout_marginEnd="@dimen/editor_field_right_padding"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingStart="12dip"
- android:paddingEnd="@dimen/editor_spinner_end_padding_workaround" />
+ android:textSize="@dimen/editor_form_text_size"
+ android:paddingRight="@dimen/editor_spinner_right_padding_workaround" />
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index 43f8ae6..d2c7fb9 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -21,9 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="@dimen/editor_min_line_item_height"
- android:layout_marginRight="2dip"
- android:layout_marginEnd="2dip"
- android:layout_gravity="bottom">
+ android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/delete_button"
android:layout_width="wrap_content"
diff --git a/res/layout/edit_field_list.xml b/res/layout/edit_field_list.xml
index 6922212..066810a 100644
--- a/res/layout/edit_field_list.xml
+++ b/res/layout/edit_field_list.xml
@@ -21,8 +21,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editors"
android:layout_width="0dip"
- android:layout_weight="1"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/editor_field_left_padding"
- android:paddingStart="@dimen/editor_field_left_padding"
+ android:layout_weight="1"
android:orientation="vertical" />
diff --git a/res/layout/edit_field_list_with_anchor_view.xml b/res/layout/edit_field_list_with_anchor_view.xml
index ca1bdaf..a2c4cd1 100644
--- a/res/layout/edit_field_list_with_anchor_view.xml
+++ b/res/layout/edit_field_list_with_anchor_view.xml
@@ -22,8 +22,6 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingLeft="@dimen/editor_field_left_padding"
- android:paddingStart="@dimen/editor_field_left_padding"
android:orientation="vertical">
<LinearLayout
android:id="@+id/editors"
diff --git a/res/layout/edit_simple_spinner_item.xml b/res/layout/edit_simple_spinner_item.xml
new file mode 100644
index 0000000..6b78dac
--- /dev/null
+++ b/res/layout/edit_simple_spinner_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+-->
+
+<!-- This TextView is displayed inside editor Spinners. In order to make this TextView get laid
+ out the same as an EditText, we use the EditText's background and gravity=center_vertical. The
+ EditText's background 9patch directly affects padding. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?android:attr/editTextBackground"
+ android:gravity="center_vertical"
+ android:paddingStart="0dp"
+ android:paddingEnd="0dp"
+ android:maxLines="1"
+ android:ellipsize="end" />
\ No newline at end of file
diff --git a/res/layout/edit_spinner.xml b/res/layout/edit_spinner.xml
index 81fb590..580b001 100644
--- a/res/layout/edit_spinner.xml
+++ b/res/layout/edit_spinner.xml
@@ -16,15 +16,14 @@
-->
<!-- Spinner for a field in the contact editor. -->
-
-<!-- Note: explicitly override the default left and right padding on spinner -->
<Spinner
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/spinner"
android:layout_gravity="bottom"
+ style="@android:style/Widget.Material.Spinner.Underlined"
+ android:dropDownWidth="@dimen/editor_type_label_dropdown_width"
android:layout_width="@dimen/editor_type_label_width"
android:layout_height="@dimen/editor_min_line_item_height"
- android:paddingLeft="0dip"
- android:paddingRight="10dip"
- android:paddingStart="0dip"
- android:paddingEnd="10dip" />
+ android:paddingBottom="0dp"
+ android:paddingTop="0dp"
+ android:paddingRight="@dimen/editor_spinner_right_padding_workaround" />
diff --git a/res/layout/editor_account_header_expandable.xml b/res/layout/editor_account_header_expandable.xml
new file mode 100644
index 0000000..5d347f0
--- /dev/null
+++ b/res/layout/editor_account_header_expandable.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- Header at the top of a raw contact editor. This is clickable to expand/collapse the editor. -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/account_header_container"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingStart="16dp"
+ android:focusable="true"
+ >
+
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:paddingBottom="24dp"
+ android:paddingTop="24dp"
+ android:orientation="vertical"
+ >
+
+ <TextView
+ android:id="@+id/account_type"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:singleLine="true"
+ android:textColor="@color/primary_text_color"
+ android:ellipsize="end"
+ />
+
+ <TextView
+ android:id="@+id/account_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:singleLine="true"
+ android:textColor="@color/secondary_text_color"
+ android:ellipsize="end"
+ />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/expand_account_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:layout_gravity="center_vertical|end"
+ android:clickable="false"
+ android:paddingLeft="@dimen/editor_round_button_padding_left"
+ android:paddingRight="@dimen/editor_round_button_padding_right"
+ android:paddingStart="@dimen/editor_round_button_padding_left"
+ android:paddingEnd="@dimen/editor_round_button_padding_right"
+ android:paddingTop="@dimen/editor_round_button_padding_top"
+ android:paddingBottom="@dimen/editor_round_button_padding_bottom"
+ />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/editor_account_header_with_dropdown.xml b/res/layout/editor_account_selector.xml
similarity index 61%
rename from res/layout/editor_account_header_with_dropdown.xml
rename to res/layout/editor_account_selector.xml
index 015358e..2f883f2 100644
--- a/res/layout/editor_account_header_with_dropdown.xml
+++ b/res/layout/editor_account_selector.xml
@@ -14,19 +14,24 @@
limitations under the License.
-->
+<!-- Header at the top of a raw contact editor. This allows users to change the account that
+ the raw contact is saved in. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_container"
+ android:id="@+id/account_selector_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="48dip"
- android:background="#EEEEEE"
+ android:layout_marginBottom="@dimen/editor_padding_between_editor_views"
android:orientation="horizontal"
- android:gravity="center_vertical"
- android:paddingLeft="@dimen/account_container_left_padding"
- android:paddingRight="28dip"
- android:paddingStart="@dimen/account_container_left_padding"
- android:paddingEnd="28dip">
+ android:paddingTop="16dp"
+ android:visibility="gone" >
+
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:src="@drawable/ic_account_circle_black_24dp"
+ android:contentDescription="@string/header_account_entry"
+ style="@style/EditKindIconStyle" />
<LinearLayout
android:id="@+id/account"
@@ -34,42 +39,29 @@
android:layout_width="0dip"
android:layout_weight="1"
android:orientation="vertical"
- style="?android:attr/spinnerStyle">
+ android:layout_marginEnd="48dp"
+ style="@android:style/Widget.Material.Spinner.Underlined">
<TextView
- android:id="@+id/account_type"
+ android:id="@+id/account_type_selector"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="16sp"
android:singleLine="true"
android:textColor="@color/primary_text_color"
android:ellipsize="end" />
<TextView
- android:id="@+id/account_name"
+ android:id="@+id/account_name_selector"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingRight="8dip"
android:paddingEnd="8dip"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="14sp"
android:singleLine="true"
- android:textColor="@color/primary_text_color"
+ android:textColor="@color/secondary_text_color"
android:ellipsize="end" />
</LinearLayout>
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginLeft="10dip"
- android:layout_marginStart="10dip">
-
- <ImageView
- android:id="@+id/account_icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:layout_gravity="center_vertical" />
-
- </FrameLayout>
-
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/event_field_editor_view.xml b/res/layout/event_field_editor_view.xml
index adca17e..f4e5d28 100644
--- a/res/layout/event_field_editor_view.xml
+++ b/res/layout/event_field_editor_view.xml
@@ -20,36 +20,29 @@
<com.android.contacts.editor.EventFieldEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/editor_min_line_item_height"
- android:orientation="vertical">
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
<LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:orientation="horizontal"
- android:gravity="center_vertical">
+ android:orientation="vertical">
<include
android:id="@+id/date_view"
layout="@layout/edit_date_picker" />
- <Spinner
- android:id="@+id/spinner"
- android:layout_width="@dimen/editor_type_label_width"
- android:layout_height="match_parent"
- android:layout_gravity="bottom"
- android:paddingLeft="0dip"
- android:paddingRight="10dip"
- android:paddingStart="0dip"
- android:paddingEnd="10dip"
- android:visibility="gone"/>
-
<include
- android:id="@+id/delete_button_container"
- layout="@layout/edit_delete_button"
+ android:id="@+id/spinner"
+ layout="@layout/edit_spinner"
android:visibility="gone" />
</LinearLayout>
+ <include
+ android:id="@+id/delete_button_container"
+ layout="@layout/edit_delete_button"
+ android:visibility="gone" />
+
</com.android.contacts.editor.EventFieldEditorView>
diff --git a/res/layout/expanding_entry_card_view.xml b/res/layout/expanding_entry_card_view.xml
index 6b89759..7eacd1f 100644
--- a/res/layout/expanding_entry_card_view.xml
+++ b/res/layout/expanding_entry_card_view.xml
@@ -33,8 +33,8 @@
<View
android:id="@+id/title_separator"
android:layout_width="match_parent"
- android:layout_height="@dimen/expanding_entry_card_item_separator_height"
- android:background="@color/expanding_entry_card_item_separator_color"
+ android:layout_height="@dimen/divider_line_height"
+ android:background="@color/divider_line_color_light"
android:visibility="gone" />
<LinearLayout
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index fa447bb..8f9bc7a 100644
--- a/res/layout/item_group_membership.xml
+++ b/res/layout/item_group_membership.xml
@@ -19,10 +19,12 @@
android:id="@+id/group_membership_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="horizontal">
- <include
- layout="@layout/edit_kind_title" />
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:src="@drawable/ic_people_black_24dp"
+ style="@style/EditKindIconStyle" />
<Button
style="@style/SpinnerButtonStyle"
@@ -30,14 +32,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/editor_min_line_item_height"
- android:layout_marginLeft="@dimen/editor_field_left_padding"
- android:layout_marginRight="@dimen/editor_field_left_padding"
- android:layout_marginStart="@dimen/editor_field_left_padding"
- android:layout_marginEnd="@dimen/editor_field_left_padding"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="start|center_vertical"
+ android:textSize="@dimen/editor_form_text_size"
android:focusable="true"
- android:paddingStart="12dip"
- android:paddingEnd="@dimen/editor_spinner_end_padding_workaround"/>
+ android:layout_marginEnd="@dimen/editor_delete_button_size"
+ android:layout_marginBottom="@dimen/editor_padding_between_editor_views"
+ android:paddingRight="@dimen/editor_spinner_right_padding_workaround"/>
</com.android.contacts.editor.GroupMembershipView>
diff --git a/res/layout/item_kind_section.xml b/res/layout/item_kind_section.xml
index 157ca1c..d62523b 100644
--- a/res/layout/item_kind_section.xml
+++ b/res/layout/item_kind_section.xml
@@ -20,11 +20,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="horizontal">
- <include
- android:id="@+id/kind_title_layout"
- layout="@layout/edit_kind_title" />
+ <ImageView
+ android:id="@+id/kind_icon"
+ style="@style/EditKindIconStyle" />
<LinearLayout
android:id="@+id/kind_editors"
@@ -32,8 +32,4 @@
android:layout_height="wrap_content"
android:orientation="vertical" />
- <include
- android:id="@+id/add_field_footer"
- layout="@layout/edit_add_field" />
-
</com.android.contacts.editor.KindSectionView>
\ No newline at end of file
diff --git a/res/layout/item_photo_editor.xml b/res/layout/item_photo_editor.xml
index 48af96c..e3eff4e 100644
--- a/res/layout/item_photo_editor.xml
+++ b/res/layout/item_photo_editor.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,40 +14,71 @@
limitations under the License.
-->
-<view
- class="com.android.contacts.editor.PhotoEditorView"
+<view class="com.android.contacts.editor.PhotoEditorView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <FrameLayout
- android:layout_width="48dip"
- android:layout_height="48dip"
- >
- <ImageView
- android:id="@+id/photo"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:cropToPadding="true"
- android:scaleType="centerCrop"
- android:gravity="start"
- />
- <View
- android:id="@+id/frame"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="true"
- android:focusable="true"
- android:contentDescription="@string/description_contact_photo"
- android:background="?android:attr/selectableItemBackground"
- />
- </FrameLayout>
+ android:orientation="horizontal" >
+
<ImageView
- android:id="@+id/photo_triangle_affordance"
- android:src="@drawable/account_spinner_icon"
+ android:id="@+id/kind_icon"
+ android:src="@drawable/ic_camera_alt_black_24dp"
+ android:layout_marginTop="13dp"
+ android:contentDescription="@string/header_photo_entry"
+ style="@style/EditKindIconStyle" />
+
+ <!-- Needs 10dp of top padding, in order get a total of 32dp of padding between this view
+ and the previous DataKindSection. Note that EditTexts in other editor.xml files have this
+ padding built in. Similarly, we need to add 4dp of start margin to make up for the padding
+ that an EditText would have in this image's place. -->
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="72dip"
+ android:layout_height="72dip"
+ android:cropToPadding="true"
+ android:scaleType="centerCrop"
+ android:layout_marginTop="15dp"
+ android:layout_marginStart="4dp"
+ android:contentDescription="@string/description_contact_photo"
+ android:layout_marginBottom="@dimen/editor_padding_below_photo"
+ android:gravity="start" />
+
+ <!-- We want 16dp for the effective marginStart. So we set 12dp, since the private
+ @android:dimen/control_inset_material already includes 4dp of padding. -->
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- />
+ android:layout_marginStart="12dp" >
+
+ <!-- The values applied to this button are complicated:
+ 1) We want 16dp internal padding in the button. The background drawable is inset
+ by private @android:dimen/button_inset_horizontal_material=4dp. Therefore,
+ we need paddingStart/End of 20dp.
+ 2) In order to leave enough room for the 32dp RadioButton, this can only be 46dp.
+ This is 2dp less than the default touch target size.
+ 3) This button will appear to be offset by the private
+ @android:dimen/button_inset_vertical_material amount. Therefore, in order to achieve
+ 15dp of apparent top margin, we only need to apply 9dp. -->
+ <Button
+ android:id="@+id/change_button"
+ android:layout_width="wrap_content"
+ android:layout_height="46dp"
+ android:textSize="@dimen/editor_form_text_size"
+ android:textColor="@color/primary_text_color"
+ android:layout_marginTop="9dp"
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:text="@string/change_photo" />
+
+ <!-- Don't explicitly set the layout_height in case we need to rely on text wrapping.
+ For one line, we can expect the height to be 32dp with 16dp text size. -->
+ <RadioButton
+ android:id="@+id/primary_checkbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="48dp"
+ android:textSize="@dimen/editor_form_text_size"
+ android:text="@string/primary_photo" />
+ </LinearLayout>
</view>
diff --git a/res/layout/item_photo_editor_readonly.xml b/res/layout/item_photo_editor_readonly.xml
new file mode 100644
index 0000000..edb6f61
--- /dev/null
+++ b/res/layout/item_photo_editor_readonly.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- A readonly version of item_photo_editor.xml shown in the readonly raw contact editor. -->
+<view class="com.android.contacts.editor.PhotoEditorView"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:src="@drawable/ic_camera_alt_black_24dp"
+ android:layout_marginTop="0dp"
+ android:contentDescription="@string/header_photo_entry"
+ style="@style/EditKindIconStyle" />
+
+ <!-- We need to add 2dp of start margin to make up for the padding that a TextView would
+ have in this image's place. We add 2dp of top margin, so that icon drawable is a little
+ below the top of this ImageView. -->
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="72dip"
+ android:layout_height="72dip"
+ android:cropToPadding="true"
+ android:scaleType="centerCrop"
+ android:layout_marginTop="2dp"
+ android:layout_marginStart="2dp"
+ android:contentDescription="@string/description_contact_photo"
+ android:layout_marginBottom="@dimen/editor_padding_around_read_only_photo_editor"
+ android:gravity="start" />
+
+
+ <!-- Don't explicitly set the layout_height in case we need to rely on text wrapping.
+ For one line, we can expect the height to be 32dp with 16dp text size. -->
+ <RadioButton
+ android:id="@+id/primary_checkbox"
+ android:layout_marginStart="12dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="@dimen/editor_delete_button_width"
+ android:layout_marginTop="2dp"
+ android:textSize="@dimen/editor_form_text_size"
+ android:text="@string/primary_photo" />
+</view>
diff --git a/res/layout/item_read_only_field.xml b/res/layout/item_read_only_field.xml
index d4ae179..ec75e1a 100644
--- a/res/layout/item_read_only_field.xml
+++ b/res/layout/item_read_only_field.xml
@@ -18,50 +18,41 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_marginEnd="@dimen/editor_delete_button_width"
+ android:layout_marginBottom="@dimen/editor_padding_between_read_only_editor_views"
+ android:orientation="horizontal">
- <include
- android:id="@+id/kind_title_layout"
- layout="@layout/edit_kind_title" />
-
- <!-- Shown only when id/kind_title_layout is hidden, dividing a previous item and this item. -->
- <View
- android:id="@+id/divider"
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
- android:layout_marginStart="8dip"
- android:layout_marginEnd="8dip"
- android:background="@color/secondary_header_separator_color" />
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:layout_marginTop="2dp"
+ style="@style/EditKindIconStyle" />
<LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
- android:minHeight="@dimen/editor_min_line_item_height"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginStart="16dip"
- android:layout_marginEnd="16dip"
- android:orientation="horizontal">
+ android:orientation="vertical">
+
<TextView
android:id="@+id/data"
- android:layout_width="0px"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="@dimen/editor_form_text_size"
android:textColor="?android:attr/textColorSecondary"
- android:singleLine="true"/>
+ android:singleLine="true"
+ android:saveEnabled="false"
+ android:enabled="false"/>
+
<TextView
android:id="@+id/type"
- android:layout_width="wrap_content"
+ android:layout_width="@dimen/editor_type_label_width"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="@dimen/editor_form_text_size"
android:textColor="?android:attr/textColorSecondary"
- android:textAllCaps="true"
- android:singleLine="true"/>
+ android:singleLine="true"
+ android:saveEnabled="false"
+ android:enabled="false"/>
+
</LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/nick_name_editor_view.xml b/res/layout/nick_name_editor_view.xml
new file mode 100644
index 0000000..3b91917
--- /dev/null
+++ b/res/layout/nick_name_editor_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 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.
+ -->
+
+<com.android.contacts.editor.TextFieldsEditorView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/editor_min_line_item_height"
+ android:layout_marginStart="@dimen/editor_kind_icon_total_width"
+ android:layout_marginEnd="@dimen/editor_delete_button_width">
+
+ <!-- This isn't used in the nickname field. It is only included so that
+ TextFieldsEditorView's base classes don't need extra null checks. -->
+ <include
+ android:id="@+id/spinner"
+ layout="@layout/edit_spinner"
+ android:visibility="gone" />
+
+ <include
+ android:id="@+id/editors"
+ layout="@layout/edit_field_list" />
+
+ <!-- This isn't used in the nickname field. It is only included so that
+ TextFieldsEditorView doesn't need extra null checks. -->
+ <include
+ android:id="@+id/delete_button_container"
+ layout="@layout/edit_delete_button"
+ android:visibility="gone" />
+
+</com.android.contacts.editor.TextFieldsEditorView>
diff --git a/res/layout/organization_editor_view_switcher.xml b/res/layout/organization_editor_view_switcher.xml
deleted file mode 100644
index 07d1cd8..0000000
--- a/res/layout/organization_editor_view_switcher.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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 "organization" field in contact editor which either shows the "add
- organization" button or a container (which should be populated with the actual
- list of edit text fields).
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <TextView
- android:id="@+id/add_organization_button"
- android:layout_width="match_parent"
- android:layout_height="48dip"
- android:paddingLeft="@dimen/editor_add_field_label_left_padding"
- android:paddingRight="16dip"
- android:paddingStart="@dimen/editor_add_field_label_left_padding"
- android:paddingEnd="16dip"
- android:gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/add_organization"
- android:focusable="true"
- android:clickable="true"/>
-
- <!-- This is later populated with the actual editable text fields for "organization" -->
- <FrameLayout
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/phonetic_name_editor_view.xml b/res/layout/phonetic_name_editor_view.xml
index d67dcf5..efaf644 100644
--- a/res/layout/phonetic_name_editor_view.xml
+++ b/res/layout/phonetic_name_editor_view.xml
@@ -20,33 +20,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/editor_min_line_item_height"
- android:orientation="vertical">
+ android:layout_marginStart="@dimen/editor_kind_icon_total_width">
+ <!-- This isn't used in PhoneticNameEditorView. It is only included so that
+ StructuredNameEditorView's base classes don't need extra null checks. -->
<include
android:id="@+id/spinner"
layout="@layout/edit_spinner"
android:visibility="gone" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:gravity="center_vertical">
+ <include
+ android:id="@+id/editors"
+ layout="@layout/edit_field_list" />
- <include
- android:id="@+id/editors"
- layout="@layout/edit_field_list" />
+ <include
+ android:id="@+id/expansion_view_container"
+ layout="@layout/name_edit_expansion_view"
+ android:visibility="visible" />
- <include
- android:id="@+id/expansion_view_container"
- layout="@layout/name_edit_expansion_view"
- android:visibility="gone" />
-
- <include
- android:id="@+id/delete_button_container"
- layout="@layout/edit_delete_button"
- android:visibility="gone" />
-
- </LinearLayout>
+ <!-- This isn't used in PhoneticNameEditorView. It is only included so that
+ StructuredNameEditorView's base classes don't need extra null checks. -->
+ <include
+ android:id="@+id/delete_button_container"
+ layout="@layout/edit_delete_button"
+ android:visibility="gone" />
</com.android.contacts.editor.PhoneticNameEditorView>
diff --git a/res/layout/quickcontact_expanding_entry_card_button.xml b/res/layout/quickcontact_expanding_entry_card_button.xml
index 1f0c724..b198b06 100644
--- a/res/layout/quickcontact_expanding_entry_card_button.xml
+++ b/res/layout/quickcontact_expanding_entry_card_button.xml
@@ -22,8 +22,8 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/expanding_entry_card_item_separator_height"
- android:background="@color/expanding_entry_card_item_separator_color" />
+ android:layout_height="@dimen/divider_line_height"
+ android:background="@color/divider_line_color_light" />
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/layout/quickcontact_header.xml b/res/layout/quickcontact_header.xml
index 37672c7..88a80f7 100644
--- a/res/layout/quickcontact_header.xml
+++ b/res/layout/quickcontact_header.xml
@@ -34,20 +34,19 @@
android:id="@+id/title_gradient"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone"
android:layout_gravity="bottom" />
<View
android:id="@+id/action_bar_gradient"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone"
android:layout_gravity="top" />
<!-- Need to set a non null background on Toolbar in order for MenuItem ripples to be drawn on
this view, instead of another. This will *not* cause an additional draw since the
background is transparent.-->
<Toolbar
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_gravity="end|top"
android:layout_height="?android:attr/actionBarSize"
android:background="#00000000"
android:id="@+id/toolbar"/>
diff --git a/res/layout/raw_contact_editor_view.xml b/res/layout/raw_contact_editor_view.xml
index 9811602..a7e74bc 100644
--- a/res/layout/raw_contact_editor_view.xml
+++ b/res/layout/raw_contact_editor_view.xml
@@ -16,49 +16,41 @@
<com.android.contacts.editor.RawContactEditorView
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingTop="@dimen/editor_padding_top">
+ android:orientation="vertical" >
+ <!-- There are two mutually exclusive account headers that look significantly different.
+ The editor_account_selector is used when an account needs to be chosen. -->
<include
- layout="@layout/editor_account_header_with_dropdown" />
+ layout="@layout/editor_account_header_expandable" />
+ <include
+ layout="@layout/editor_account_selector" />
<LinearLayout
- android:id="@+id/body"
+ android:id="@+id/collapsable_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical" >
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:orientation="horizontal"
- android:paddingTop="8dip">
+ <include
+ android:id="@+id/edit_name"
+ layout="@layout/structured_name_editor_view" />
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:orientation="vertical">
+ <include
+ android:id="@+id/edit_phonetic_name"
+ layout="@layout/phonetic_name_editor_view" />
- <include
- android:id="@+id/edit_name"
- layout="@layout/structured_name_editor_view" />
+ <include
+ android:id="@+id/edit_nick_name"
+ layout="@layout/nick_name_editor_view" />
- <include
- android:id="@+id/edit_phonetic_name"
- layout="@layout/phonetic_name_editor_view" />
-
- </LinearLayout>
-
- <include
- android:id="@+id/edit_photo"
- android:layout_marginRight="8dip"
- android:layout_marginEnd="8dip"
- layout="@layout/item_photo_editor" />
-
- </LinearLayout>
+ <include
+ android:id="@+id/edit_photo"
+ android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
+ layout="@layout/item_photo_editor" />
<LinearLayout
android:id="@+id/sect_fields"
@@ -67,13 +59,11 @@
android:orientation="vertical"
android:layout_marginBottom="16dip"/>
- <Button
- android:id="@+id/button_add_field"
- android:text="@string/add_field"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="32dip"/>
-
</LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/divider_line_height"
+ android:background="@color/divider_line_color_light" />
+
</com.android.contacts.editor.RawContactEditorView>
diff --git a/res/layout/raw_contact_readonly_editor_view.xml b/res/layout/raw_contact_readonly_editor_view.xml
index 797162d..99ed236 100644
--- a/res/layout/raw_contact_readonly_editor_view.xml
+++ b/res/layout/raw_contact_readonly_editor_view.xml
@@ -18,52 +18,69 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingTop="@dimen/editor_padding_top"
- android:paddingBottom="32dip">
+ android:orientation="vertical" >
<include
- layout="@layout/editor_account_header" />
+ layout="@layout/editor_account_header_expandable" />
<LinearLayout
- android:layout_height="wrap_content"
+ android:id="@+id/collapsable_section"
android:layout_width="match_parent"
- android:orientation="horizontal"
- android:paddingTop="8dip"
- android:paddingLeft="16dip"
- android:paddingStart="16dip">
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <TextView android:id="@+id/read_only_name"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary" />
+ <!-- Want 16dp of apparent top padding. Since TextView has 4dp of inset/padding built in,
+ only set marginTop=12dp. -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/editor_padding_around_read_only_photo_editor"
+ android:layout_marginTop="12dp"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:layout_marginTop="2dp"
+ android:src="@drawable/ic_person_black_24dp"
+ android:contentDescription="@string/header_name_entry"
+ style="@style/EditKindIconStyle" />
+
+ <TextView
+ android:id="@+id/read_only_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="@dimen/editor_delete_button_width"
+ android:singleLine="true"
+ android:textSize="@dimen/editor_form_text_size"
+ android:textColor="?android:attr/textColorSecondary"
+ android:enabled="false"/>
+
+ </LinearLayout>
<include
android:id="@+id/edit_photo"
- android:layout_marginRight="8dip"
- android:layout_marginEnd="8dip"
- layout="@layout/item_photo_editor" />
+ layout="@layout/item_photo_editor_readonly" />
+
+ <Button
+ android:id="@+id/button_edit_externally"
+ android:text="@string/edit_contact"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
+ android:layout_marginBottom="@dimen/editor_padding_below_photo"
+ android:layout_marginEnd="13dip"
+ android:layout_marginStart="13dip"/>
+
+ <LinearLayout android:id="@+id/sect_general"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"/>
</LinearLayout>
- <Button
- android:id="@+id/button_edit_externally"
- android:text="@string/edit_contact"
+ <View
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="13dip"
- android:layout_marginBottom="13dip"
- android:layout_marginLeft="13dip"
- android:layout_marginStart="13dip"/>
-
- <LinearLayout android:id="@+id/sect_general"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"/>
+ android:layout_height="@dimen/divider_line_height"
+ android:background="@color/divider_line_color_light" />
</com.android.contacts.editor.RawContactReadOnlyEditorView>
diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml
index 6320aa5..2b0ee7b 100644
--- a/res/layout/structured_name_editor_view.xml
+++ b/res/layout/structured_name_editor_view.xml
@@ -20,31 +20,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/editor_min_line_item_height"
- android:orientation="vertical">
+ android:orientation="horizontal">
+ <!-- This isn't used in StructuredNameEditorView. It is only included so that
+ StructuredNameEditorView's base classes don't need extra null checks. -->
<include
android:id="@+id/spinner"
layout="@layout/edit_spinner"
android:visibility="gone" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/kind_icon"
+ android:src="@drawable/ic_person_black_24dp"
+ android:contentDescription="@string/header_name_entry"
+ style="@style/EditKindIconStyle" />
- <include
- layout="@layout/edit_field_list_with_anchor_view" />
+ <include
+ layout="@layout/edit_field_list_with_anchor_view" />
- <include
- android:id="@+id/expansion_view_container"
- layout="@layout/name_edit_expansion_view"
- android:visibility="gone" />
+ <include
+ android:id="@+id/expansion_view_container"
+ layout="@layout/name_edit_expansion_view"
+ android:visibility="gone" />
- <include
- android:id="@+id/delete_button_container"
- layout="@layout/edit_delete_button"
- android:visibility="gone" />
-
- </LinearLayout>
+ <!-- This isn't used in StructuredNameEditorView. It is only included so that
+ StructuredNameEditorView's base classes don't need extra null checks. -->
+ <include
+ android:id="@+id/delete_button_container"
+ layout="@layout/edit_delete_button"
+ android:visibility="gone" />
</com.android.contacts.editor.StructuredNameEditorView>
diff --git a/res/layout/text_fields_editor_view.xml b/res/layout/text_fields_editor_view.xml
index 5ae83c6..dc3a312 100644
--- a/res/layout/text_fields_editor_view.xml
+++ b/res/layout/text_fields_editor_view.xml
@@ -19,33 +19,30 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="horizontal">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
android:layout_weight="1"
- android:orientation="horizontal"
- android:gravity="center_vertical">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <include
- layout="@layout/edit_field_list_with_anchor_view" />
-
- <include
- android:id="@+id/expansion_view_container"
- layout="@layout/edit_expansion_view"
- android:visibility="gone" />
+ <LinearLayout
+ android:id="@+id/editors"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
<include
android:id="@+id/spinner"
layout="@layout/edit_spinner"
android:visibility="gone" />
- <include
- android:id="@+id/delete_button_container"
- layout="@layout/edit_delete_button"
- android:visibility="gone" />
-
</LinearLayout>
+ <include
+ android:id="@+id/delete_button_container"
+ layout="@layout/edit_delete_button"
+ android:visibility="gone" />
+
</com.android.contacts.editor.TextFieldsEditorView>
diff --git a/res/menu/quickcontact.xml b/res/menu/quickcontact.xml
index 13caa59..d1658fc 100644
--- a/res/menu/quickcontact.xml
+++ b/res/menu/quickcontact.xml
@@ -26,6 +26,10 @@
android:showAsAction="always" />
<item
+ android:id="@+id/menu_delete"
+ android:title="@string/menu_deleteContact" />
+
+ <item
android:id="@+id/menu_share"
android:title="@string/menu_share"
android:alphabeticShortcut="s" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index dd56f89..97d590b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakte"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakte"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakte"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakte"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontak"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direk skakel"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Kies \'n nommer om te bel"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Kies \'n nommer om te stuur"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kies \'n kontak"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Skep nuwe kontak"</string>
<string name="starredList" msgid="4817256136413959463">"Gester"</string>
<string name="frequentList" msgid="7154768136473953056">"Gereeld"</string>
<string name="strequentList" msgid="5640192862059373511">"Gunstelinge"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Bekyk kontak"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Voeg by gunstelinge"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Verwyder van gunstelinge"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Verwyder uit gunstelinge"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"By gunstelinge gevoeg"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redigeer"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Vee uit"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Plaas op tuisskerm"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Name van jou kontakte"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Geen program is gevind om hierdie aksie te hanteer nie."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik om na die vorige skerm terug te keer"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Voeg foonnommer by"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Voeg e-pos by"</string>
<string name="missing_app" msgid="1466111003546611387">"Geen program is gevind om hierdie handeling te behartig nie."</string>
<string name="menu_share" msgid="943789700636542260">"Deel"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Voeg by kontakte"</string>
<string name="share_via" msgid="563121028023030093">"Deel kontak met"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Skep groep onder rekening"</string>
<string name="audio_chat" msgid="2535716629358298691">"Stemklets"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Gebruik hierdie foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nie redigeerbaar vanuit hierdie program nie."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Geen bykomende inligting vir hierdie kontak nie."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nie redigeerbaar op hierdie toestel nie"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Rangskik lys volgens"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Voornaam"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Van"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Bekyk kontakname"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Voornaam eerste"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Van eerste"</string>
<string name="take_photo" msgid="7496128293167402354">"Neem foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Neem nuwe foto"</string>
<string name="pick_photo" msgid="2129509985223564942">"Kies foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Voeg rekening by"</string>
<string name="add_new_account" msgid="5748627740680940264">"Voeg nuwe rekening by"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Voer databasislêers uit"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Foto. Kies om te verander"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"voeg nuwe kontak by"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Sien meer"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Sien minder"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Sien alles"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontak"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Onlangs"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Meer oor"</string>
<string name="send_message" msgid="8938418965550543196">"Stuur boodskap"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Skep tans \'n persoonlike kopie …"</string>
<string name="yesterday" msgid="6840858548955018569">"Gister"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 14e4bf0..0b742f1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"ዕውቂያዎች"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"ዕውቂያዎች"</string>
+ <string name="people" msgid="1190841469952343354">"ዕውቂያዎች"</string>
<string name="contactsList" msgid="8661624236494819731">"እውቅያዎች"</string>
<string name="shortcutContact" msgid="749243779392912958">"እውቅያ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ቀጥታ ደውል"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ለመደወል ቁጥር ምረጥ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"መልዕክትለመላክ ቁጥር ምረጥ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ዕውቅያ ምረጥ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"አዲስ እውቂያ ይፍጠሩ"</string>
<string name="starredList" msgid="4817256136413959463">"ኮከብ የተደረገባቸው"</string>
<string name="frequentList" msgid="7154768136473953056">"ተደጋጋሚ"</string>
<string name="strequentList" msgid="5640192862059373511">"ተወዳጆች"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"ዕውቂያ ዕይ"</string>
<string name="menu_addStar" msgid="2908478235715404876">"ወደ ተወዳጅ አክል"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"ከተወዳጆች አስወግድ"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"ከተወዳጆች ውስጥ ተወግዷል"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"ወደ ተወዳጆች ታክሏል"</string>
<string name="menu_editContact" msgid="9042415603857662633">"አርትዕ"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ሰርዝ"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"መነሻ የማያ ገጽ ላይ አስቀምጥ"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"የዕውቂያዎችዎ ስሞች"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ይህን እርምጃ ለማስተናገድ ምንም መተግበሪያ አልተገኘም፡፡"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ወደ ቀዳሚው ማያ ገጽ ለመመለስ ጠቅ ያድርጉ"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"የስልክ ቁጥር ያክሉ"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ኢሜይል ያክሉ"</string>
<string name="missing_app" msgid="1466111003546611387">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም።"</string>
<string name="menu_share" msgid="943789700636542260">"መጋሪያ"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"ወደ እውቂያዎች ያክሉ"</string>
<string name="share_via" msgid="563121028023030093">"ዕውቂያበ በኩል አጋራ"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"በመለያ ስር ቡድን ፍጠር"</string>
<string name="audio_chat" msgid="2535716629358298691">"የድምፅ ውይይት"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ይህን ፎቶ ተጠቀም"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ከዚህ መተግበሪያ አርትዕ ሊደረግ አይችልም፡፡"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ለእዚህ ዕውቂያ ምንም ተጨማሪ መረጃ የለም"</string>
<string name="group_read_only" msgid="1061762906115697637">"በዚህ መሣሪያ ላይ አርትዕ መደረግ የሚችል አይደለም።"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"ዝርዝር በ ለይ"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"መጠሪያ ስም"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"የቤተሰብ ስም"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"የእውቂያ ስሞችን እይ"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"መጠሪያ ስም መጀመሪያ"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"የቤተሰብ መነሻስም"</string>
<string name="take_photo" msgid="7496128293167402354">"ፎቶ አንሳ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"አዲስ ፎቶ አንሳ"</string>
<string name="pick_photo" msgid="2129509985223564942">"ፎቶ ምረጥ"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"መለያ አክል"</string>
<string name="add_new_account" msgid="5748627740680940264">"አዲስ መለያ አክል"</string>
<string name="menu_export_database" msgid="2659719297530170820">"የውሂብ ጎታ ፋይሎችን ወደ ውጭ ላክ"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ስዕል። ለመቀየር ይምረጡ"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"አዲስ እውቂያ ያክሉ"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ተጨማሪ ይመልከቱ"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"ያነሰ ይመልከቱ"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"ሁሉንም ይመልከቱ"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"እውቂያ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"የቅርብ ጊዜ"</string>
- <string name="about_card_title" msgid="2920942314212825637">"ስለ"</string>
<string name="send_message" msgid="8938418965550543196">"መልዕክት ላክ"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"የግል ቅጂ በመፍጠር ላይ..."</string>
<string name="yesterday" msgid="6840858548955018569">"ትላንት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 619145f..9f4d035 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"جهات الاتصال"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"جهات الاتصال"</string>
+ <string name="people" msgid="1190841469952343354">"جهات الاتصال"</string>
<string name="contactsList" msgid="8661624236494819731">"جهات الاتصال"</string>
<string name="shortcutContact" msgid="749243779392912958">"الاتصال بـ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"طلب مباشر"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"اختيار رقم للاتصال به"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"اختيار رقم لإرسال رسالة له"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"اختيار جهة اتصال"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"إنشاء جهة اتصال جديدة"</string>
<string name="starredList" msgid="4817256136413959463">"مميّزة بنجمة"</string>
<string name="frequentList" msgid="7154768136473953056">"متكررة"</string>
<string name="strequentList" msgid="5640192862059373511">"المفضلة"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"عرض جهة الاتصال"</string>
<string name="menu_addStar" msgid="2908478235715404876">"إضافة إلى المفضلة"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"إزالة من المفضلة"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"تمت الإزالة من المفضلة"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"تمت الإضافة إلى المفضلة"</string>
<string name="menu_editContact" msgid="9042415603857662633">"تعديل"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"حذف"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"وضع على الشاشة الرئيسية"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"أسماء جهات الاتصال"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"لم يتم العثور على تطبيق يمكنه مباشرة هذا الإجراء."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"انقر للرجوع إلى الشاشة السابقة"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"إضافة رقم الهاتف"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"إضافة بريد إلكتروني"</string>
<string name="missing_app" msgid="1466111003546611387">"لم يتم العثور على تطبيق يمكنه مباشرة هذا الإجراء."</string>
<string name="menu_share" msgid="943789700636542260">"مشاركة"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"إضافة إلى جهات الاتصال"</string>
<string name="share_via" msgid="563121028023030093">"مشاركة جهة الاتصال عبر"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"إنشاء مجموعة ضمن حساب"</string>
<string name="audio_chat" msgid="2535716629358298691">"دردشة صوتية"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"استخدام هذه الصورة"</string>
<string name="contact_read_only" msgid="7421346527289472273">"غير قابلة للتعديل من هذا التطبيق."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ليس هناك أية معلومات إضافية لجهة الاتصال هذه."</string>
<string name="group_read_only" msgid="1061762906115697637">"غير قابلة للتعديل على هذا الجهاز."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"تصنيف القائمة بحسب"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"الاسم الأول"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"اسم العائلة"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"عرض أسماء جهات الاتصال"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"الاسم الأول أولاً"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"اسم العائلة أولاً"</string>
<string name="take_photo" msgid="7496128293167402354">"التقاط صورة"</string>
<string name="take_new_photo" msgid="7341354729436576304">"التقاط صورة جديدة"</string>
<string name="pick_photo" msgid="2129509985223564942">"اختيار صورة"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"إضافة حساب"</string>
<string name="add_new_account" msgid="5748627740680940264">"إضافة حساب جديد"</string>
<string name="menu_export_database" msgid="2659719297530170820">"تصدير ملفات قاعدة البيانات"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"الصورة. حدد للتغيير"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"إضافة جهة اتصال جديدة"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"الاطلاع على المزيد"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"عرض أقل"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"عرض الكل"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"جهة الاتصال"</string>
<string name="recent_card_title" msgid="8982782042698001695">"الأخيرة"</string>
- <string name="about_card_title" msgid="2920942314212825637">"حول"</string>
<string name="send_message" msgid="8938418965550543196">"إرسال رسالة"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"جارٍ إنشاء نسخة شخصية..."</string>
<string name="yesterday" msgid="6840858548955018569">"أمس"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7dee020..edf4dda 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контакти"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контакти"</string>
+ <string name="people" msgid="1190841469952343354">"Контакти"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакти"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Директно набиране"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Избор на номер за обаждане"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Избор на номер за изпращане на съобщение"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Избор на контакт"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Създайте нов контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Със звезда"</string>
<string name="frequentList" msgid="7154768136473953056">"Често"</string>
<string name="strequentList" msgid="5640192862059373511">"Любими"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Преглед на контакт"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Добавяне към предпочитани"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Премахване от любими"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Премахнато от любимите"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Добавено към любимите"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Редактиране"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Изтриване"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Поставяне на началния екран"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Имена на контактите ви"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не бе намерено приложение за извършване на това действие."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликнете за връщане към предишния екран"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Добавяне на телефонен номер"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Добавяне на имейл"</string>
<string name="missing_app" msgid="1466111003546611387">"Не бе намерено приложение за извършване на това действие."</string>
<string name="menu_share" msgid="943789700636542260">"Споделяне"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Добавяне към контактите"</string>
<string name="share_via" msgid="563121028023030093">"Споделяне на контакт чрез"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Създаване на група в профил"</string>
<string name="audio_chat" msgid="2535716629358298691">"Гласов разговор"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Използване на тази снимка"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Не може да се редактира от приложението."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Няма допълнителна информация за този контакт."</string>
<string name="group_read_only" msgid="1061762906115697637">"Не може да се редактира на това у-во."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Подреждане на списък по"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Собствено име"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Фамилия"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Преглед на имената на контактите"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Първо собственото име"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Първо фамилията"</string>
<string name="take_photo" msgid="7496128293167402354">"Снимане"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Заснемане на нова снимка"</string>
<string name="pick_photo" msgid="2129509985223564942">"Избор на снимка"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Добавяне на профил"</string>
<string name="add_new_account" msgid="5748627740680940264">"Добавяне на нов профил"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Експортиране на файловете на базата от данни"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Снимка. Изберете, за да промените"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"добавяне на нов контакт"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Преглед на още"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Преглед на по-малко"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Преглед на всичко"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Скорошни"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Информация"</string>
<string name="send_message" msgid="8938418965550543196">"Изпращане на съобщение"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Създава се лично копие..."</string>
<string name="yesterday" msgid="6840858548955018569">"Вчера"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 6982f1a..5ad0ae3 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"পরিচিতিগুলি"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"পরিচিতিগুলি"</string>
+ <string name="people" msgid="1190841469952343354">"পরিচিতিগুলি"</string>
<string name="contactsList" msgid="8661624236494819731">"পরিচিতিগুলি"</string>
<string name="shortcutContact" msgid="749243779392912958">"পরিচিতি"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"সরাসরি ডায়াল"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"কল করার জন্য একটি নম্বর চয়ন করুন"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"বার্তা পাঠানোর জন্য একটি নম্বর চয়ন করুন"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"একটি পরিচিতি চয়ন করুন"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"নতুন পরিচিতি তৈরি করুন"</string>
<string name="starredList" msgid="4817256136413959463">"তারকা চিহ্নিত"</string>
<string name="frequentList" msgid="7154768136473953056">"ঘন ঘন"</string>
<string name="strequentList" msgid="5640192862059373511">"পছন্দগুলি"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"পরিচিতি দেখুন"</string>
<string name="menu_addStar" msgid="2908478235715404876">"পছন্দগুলিতে জুড়ুন"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"পছন্দসই থেকে সরান"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"পছন্দসই থেকে সরানো হয়েছে"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"পছন্দসই এ জোড়া হয়েছে"</string>
<string name="menu_editContact" msgid="9042415603857662633">"সম্পাদনা করুন"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"মুছুন"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"হোম স্ক্রীনে রাখুন"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"আপনার পরিচিতিগুলির নামগুলি"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"এই ক্রিয়াটিকে চালনা করার জন্য কোনো অ্যাপ্লিকেশান পাওয়া যায়নি৷"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"পূর্ববর্তী স্ক্রীনে প্রত্যাবর্তন করার জন্য ক্লিক করুন"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ফোন নম্বর জুড়ুন"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ইমেল জুড়ুন"</string>
<string name="missing_app" msgid="1466111003546611387">"এই ক্রিয়াটিকে চালনা করার জন্য কোনো অ্যাপ্লিকেশান পাওয়া যায়নি৷"</string>
<string name="menu_share" msgid="943789700636542260">"ভাগ করুন"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"পরিচিতিগুলিতে জুড়ুন"</string>
<string name="share_via" msgid="563121028023030093">"এর মাধ্যমে পরিচিতি ভাগ করুন"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"অ্যাকাউন্টের অধীনে গোষ্ঠী তৈরি করুন"</string>
<string name="audio_chat" msgid="2535716629358298691">"ভয়েস চ্যাট"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"এই ফটোটি ব্যবহার করুন"</string>
<string name="contact_read_only" msgid="7421346527289472273">"এই অ্যাপ্লিকেশন থেকে সম্পাদনাযোগ্য নয়৷"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"এই পরিচিতির জন্য কোনো অতিরিক্ত তথ্য নেই৷"</string>
<string name="group_read_only" msgid="1061762906115697637">"এই ডিভাইসে সম্পাদনযোগ্য নয়৷"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"এই অনুযায়ী তালিকা সাজান"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"দেওয়া নাম"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"পরিবারের নাম"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"পরিচিতির নামগুলি দেখুন"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"প্রথমে প্রদত্ত নাম"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"প্রথমে পরিবারের নাম"</string>
<string name="take_photo" msgid="7496128293167402354">"ফটো তুলুন"</string>
<string name="take_new_photo" msgid="7341354729436576304">"নতুন ফটো তুলুন"</string>
<string name="pick_photo" msgid="2129509985223564942">"ফটো চয়ন করুন"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"অ্যাকাউন্ট জুড়ুন"</string>
<string name="add_new_account" msgid="5748627740680940264">"নতুন অ্যাকাউন্ট যোগ করুন"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ডেটাবেস ফাইলগুলি রপ্তানি করুন"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"চিত্র৷ পরিবর্তন করতে নির্বাচন করুন"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"নতুন পরিচিতি যোগ করুন"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"আরো দেখুন"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"আরো কম"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"সবগুলো দেখুন"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"পরিচিতি"</string>
<string name="recent_card_title" msgid="8982782042698001695">"সাম্প্রতিক"</string>
- <string name="about_card_title" msgid="2920942314212825637">"সম্পর্কে"</string>
<string name="send_message" msgid="8938418965550543196">"বার্তা পাঠান"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"একটি ব্যক্তিগত প্রতিলিপি তৈরি করা হচ্ছে..."</string>
<string name="yesterday" msgid="6840858548955018569">"গতকাল"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 46ab365..5e4f1f1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contactes"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contactes"</string>
+ <string name="people" msgid="1190841469952343354">"Contactes"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactes"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacte"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Marcatge directe"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Trieu un número per trucar-hi"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Trieu un número per enviar-hi un missatge"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Tria un contacte"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crea un contacte nou"</string>
<string name="starredList" msgid="4817256136413959463">"Destacats"</string>
<string name="frequentList" msgid="7154768136473953056">"Freqüent"</string>
<string name="strequentList" msgid="5640192862059373511">"Preferits"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Visualitza el contacte"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Afegeix als preferits"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Elimina dels preferits"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Eliminat dels preferits"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Afegit als preferits"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edita"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Suprimeix"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Afegeix a la pantalla d\'inici"</string>
@@ -53,7 +49,7 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Suprimeix"</string>
<string name="menu_new_contact_action_bar" msgid="7263362129442119188">"Afegeix el contacte"</string>
<string name="menu_new_group_action_bar" msgid="3520232877587377175">"Afegeix un grup"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Dividir contacte?"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Separació contacte"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Aquest contacte es dividirà en diversos contactes."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Uneix"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Unió de contactes"</string>
@@ -80,7 +76,7 @@
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"No hi ha imatges disponibles a la tauleta."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"No hi ha cap imatge disponible al telèfon."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Foto de contacte"</string>
- <string name="customLabelPickerTitle" msgid="1081475101983255212">"Nom de camp personalitzat"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Nom d\'etiqueta personalitzada"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Envia les trucades directament al correu de veu"</string>
<string name="removePhoto" msgid="4898105274130284565">"Elimina la foto"</string>
<string name="noContacts" msgid="8579310973261953559">"No hi ha contactes."</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"1 contacte"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contactes"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Tots els contactes"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Tots contactes"</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Preferits"</string>
<string name="callBack" msgid="5498224409038809224">"Torna la trucada"</string>
<string name="callAgain" msgid="3197312117049874778">"Torna a trucar"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Noms dels contactes"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No s\'ha trobat cap aplicació per processar aquesta acció."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fes clic per tornar a la pantalla anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Afegeix un número de telèfon."</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Afegeix una adreça electrònica."</string>
<string name="missing_app" msgid="1466111003546611387">"No s\'ha trobat cap aplicació per processar aquesta acció."</string>
<string name="menu_share" msgid="943789700636542260">"Comparteix"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Afegeix als contactes"</string>
<string name="share_via" msgid="563121028023030093">"Comparteix el contacte mitjançant"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Creació d\'un grup al compte"</string>
<string name="audio_chat" msgid="2535716629358298691">"Xat de veu"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilitza aquesta foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"No es pot editar des d\'aquesta aplicació."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"No hi ha informació addicional per a aquest contacte."</string>
<string name="group_read_only" msgid="1061762906115697637">"No es pot editar en aquest dispositiu."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordena la llista per"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nom"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Cognom"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Mostra els noms dels contactes"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nom primer"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Cognoms primer"</string>
<string name="take_photo" msgid="7496128293167402354">"Fes una foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Fes una foto nova"</string>
<string name="pick_photo" msgid="2129509985223564942">"Tria una foto"</string>
@@ -153,7 +153,7 @@
<string name="menu_select_all" msgid="621719255150713545">"Selecciona-ho tot"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Anul·la tota la selecció"</string>
<string name="add_field" msgid="2384260056674995230">"Afegeix un altre camp"</string>
- <string name="add_new_entry_for_section" msgid="5223080690667565044">"Afegeix-ne un"</string>
+ <string name="add_new_entry_for_section" msgid="5223080690667565044">"Afegeix-ne una"</string>
<string name="add_organization" msgid="7311893231158291197">"Afegeix organització"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
<string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nom del grup"</string>
@@ -168,18 +168,18 @@
<string name="menu_copyContact" msgid="1573960845106822639">"Copia a Els meus contactes"</string>
<string name="add_to_my_contacts" msgid="1068274916793627723">"Afegeix a Els meus contactes"</string>
<string name="contact_directory_description" msgid="683398073603909119">"Directori <xliff:g id="TYPE">%1$s</xliff:g>"</string>
- <string name="list_filter_custom" msgid="8910173055702057002">"Personalitza"</string>
+ <string name="list_filter_custom" msgid="8910173055702057002">"Personalitzada"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Configuració"</string>
<string name="menu_settings" msgid="377929915873428211">"Configuració"</string>
<string name="menu_help" msgid="5123887102216637725">"Ajuda"</string>
<string name="preference_displayOptions" msgid="1341720270148252393">"Opcions de visualització"</string>
<string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
<string name="non_phone_caption" msgid="1541655052330027380">"Número de telèfon"</string>
- <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Afegeix als contactes"</string>
+ <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Afegeix-ho als contactes"</string>
<string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Afegeix al contacte"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Tanca"</string>
<string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
- <string name="date_year_toggle" msgid="7356532842767854606">"Especifica un any"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Indica un any"</string>
<string name="social_widget_label" msgid="6378905543028924592">"Contacte"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"S\'està carregant…"</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Crea un contacte nou"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Afegeix un compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Afegeix un compte nou"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporta els fitxers de la base de dades"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Imatge. Selecciona-la per canviar-la"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"afegeix un contacte nou"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Mostra\'n més"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Mostra\'n menys"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Mostra-ho tot"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contacte"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recents"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Quant a"</string>
<string name="send_message" msgid="8938418965550543196">"Envia el missatge"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"S\'està creant una còpia personal..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ahir"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9fd8e5c..8c4ad28 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakty"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakty"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakty"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Přímé vytáčení"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Výběr čísla pro hovor"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Výběr čísla pro zprávu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vyberte kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Vytvořte nový kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Označené hvězdičkou"</string>
<string name="frequentList" msgid="7154768136473953056">"Časté"</string>
<string name="strequentList" msgid="5640192862059373511">"Oblíbené"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Zobrazit kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Přidat k oblíbeným položkám"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Odebrat z oblíbených položek"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Odstraněno z oblíbených"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Přidáno mezi oblíbené"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Upravit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Smazat"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Umístit na plochu"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Jména vašich kontaktů"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikace potřebná k provedení této akce nebyla nalezena."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknutím se vrátíte na předchozí obrazovku"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Přidat telefonní číslo"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Přidat e-mail"</string>
<string name="missing_app" msgid="1466111003546611387">"Aplikace potřebná k provedení této akce nebyla nalezena."</string>
<string name="menu_share" msgid="943789700636542260">"Sdílet"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Přidat do kontaktů"</string>
<string name="share_via" msgid="563121028023030093">"Sdílet kontakt pomocí"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Vytvořit skupinu v účtu"</string>
<string name="audio_chat" msgid="2535716629358298691">"Hlasový chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Použít tuto fotografii"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nelze upravit v této aplikaci."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"U tohoto kontaktu nejsou uvedeny dodatečné informace."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nelze upravit v tomto zařízení."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Seřadit seznam podle"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Křestní jméno"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Příjmení"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Zobrazit jména kontaktů"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nejprve křestní jméno"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nejprve příjmení"</string>
<string name="take_photo" msgid="7496128293167402354">"Vyfotit"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Pořídit novou fotografii"</string>
<string name="pick_photo" msgid="2129509985223564942">"Vybrat fotku"</string>
@@ -217,7 +217,7 @@
<string name="generic_no_account_prompt" msgid="7218827704367325460">"Mějte kontakty v bezpečí, i když telefon ztratíte: synchronizujte je s některou online službou."</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"Přidat účet"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Nový kontakt nebude zálohován. Chcete přidat účet pro zálohování kontaktů online?"</string>
- <string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"Nový kontakt bude synchronizován s účtem <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
+ <string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"Nový kontakt bude synchronizován s účtem <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Nový kontakt můžete synchronizovat s jedním z následujících účtů. Který z nich chcete použít?"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Přidat nový kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Upravit kontakt"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Přidat účet"</string>
<string name="add_new_account" msgid="5748627740680940264">"Přidat nový účet"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportovat soubory databáze"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Chcete-li obrázek změnit, vyberte jej"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"přidat nový kontakt"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Zobrazit více"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Zobrazit méně"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Zobrazit vše"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nedávné"</string>
- <string name="about_card_title" msgid="2920942314212825637">"O kartě"</string>
<string name="send_message" msgid="8938418965550543196">"Odeslat zprávu"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Vytváření osobní kopie..."</string>
<string name="yesterday" msgid="6840858548955018569">"Včera"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4ea0f65..65acf65 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktpersoner"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktpersoner"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktpersoner"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direkte opkald"</string>
@@ -26,10 +25,9 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Vælg et nummer at ringe til"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Vælg et nummer, som beskeden skal sendes til"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vælg en kontaktperson"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Opret ny kontaktperson"</string>
<string name="starredList" msgid="4817256136413959463">"Stjernemarkerede"</string>
<string name="frequentList" msgid="7154768136473953056">"Ofte"</string>
- <string name="strequentList" msgid="5640192862059373511">"Foretrukne"</string>
+ <string name="strequentList" msgid="5640192862059373511">"Favorit"</string>
<string name="viewContactTitle" msgid="7989394521836644384">"Kontaktoplysninger"</string>
<string name="editContactDescription" msgid="2947202828256214947">"Rediger kontakt"</string>
<string name="insertContactDescription" msgid="4709878105452681987">"Opret kontakt"</string>
@@ -39,10 +37,8 @@
<string name="contactDetailUpdates" msgid="3780588624763446941">"Opdateringer"</string>
<string name="searchHint" msgid="8482945356247760701">"Søg i kontakter"</string>
<string name="menu_viewContact" msgid="2795575601596468581">"Vis kontakt"</string>
- <string name="menu_addStar" msgid="2908478235715404876">"Føj til foretrukne"</string>
- <string name="menu_removeStar" msgid="5844227078364227030">"Fjern fra foretrukne"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Fjernet fra foretrukne"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Føjet til foretrukne"</string>
+ <string name="menu_addStar" msgid="2908478235715404876">"Føj til favoritter"</string>
+ <string name="menu_removeStar" msgid="5844227078364227030">"Fjern fra favoritter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediger"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Slet"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placer på startskærmen"</string>
@@ -62,7 +58,7 @@
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Foreslåede kontakter"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Alle kontakter"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"Tilføjede kontakter"</string>
- <string name="menu_set_ring_tone" msgid="8728345772068064946">"Angiv ringetone"</string>
+ <string name="menu_set_ring_tone" msgid="8728345772068064946">"Indstil ringetone"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle opkald til telefonsvareren"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Du kan ikke slette kontaktpersoner fra skrivebeskyttede konti, men du kan skjule dem på listerne over dine kontaktpersoner."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Denne kontakt indeholder oplysninger fra flere konti. Oplysningerne fra skrivebeskyttede konti vil blive skjult i dine lister over kontakter, men ikke slettet."</string>
@@ -108,7 +104,7 @@
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> fundet"</item>
</plurals>
<string name="all_contacts_tab_label" msgid="6250372293594147703">"Alle kontakter"</string>
- <string name="favorites_tab_label" msgid="1524869648904016414">"Foretrukne"</string>
+ <string name="favorites_tab_label" msgid="1524869648904016414">"Favoritter"</string>
<string name="callBack" msgid="5498224409038809224">"Ring tilbage"</string>
<string name="callAgain" msgid="3197312117049874778">"Ring op igen"</string>
<string name="returnCall" msgid="8171961914203617813">"Ring tilbage"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Navne på dine kontakter"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Der blev ikke fundet nogen app, der kan håndtere denne handling."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik for at gå tilbage til forrige skærmbillede"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Tilføj mobiltelefonnummer"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Tilføj e-mail"</string>
<string name="missing_app" msgid="1466111003546611387">"Der blev ikke fundet nogen app, der kan håndtere denne handling."</string>
<string name="menu_share" msgid="943789700636542260">"Del"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Føj til kontaktpersoner"</string>
<string name="share_via" msgid="563121028023030093">"Del kontakt via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Opret gruppe på konto"</string>
<string name="audio_chat" msgid="2535716629358298691">"Talechat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Brug dette billede"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Kan ikke redigeres fra denne app."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Der er ikke flere oplysninger om denne kontaktperson."</string>
<string name="group_read_only" msgid="1061762906115697637">"Kan ikke redigeres på denne enhed."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sorter liste efter"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Fornavn"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Efternavn"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Se kontaktnavne"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternavn først"</string>
<string name="take_photo" msgid="7496128293167402354">"Tag billede"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tag nyt billede"</string>
<string name="pick_photo" msgid="2129509985223564942">"Vælg billede"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Tilføj konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tilføj ny konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportér databasefiler"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Billede. Vælg for at ændre"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"tilføj ny kontaktperson"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Se mere"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Se mindre"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Se alle"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontaktperson"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Seneste"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Om"</string>
<string name="send_message" msgid="8938418965550543196">"Send besked"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Opretter en personlig kopi..."</string>
<string name="yesterday" msgid="6840858548955018569">"I går"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 35bddc0..e5f0398 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakte"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakte"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakte"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakte"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direktwahl"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Nummer für den Anruf auswählen"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Nummer für Nachricht auswählen"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontakt auswählen"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Neuen Kontakt erstellen"</string>
<string name="starredList" msgid="4817256136413959463">"Markiert"</string>
<string name="frequentList" msgid="7154768136473953056">"Häufig"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoriten"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Kontakt anzeigen"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Zu Favoriten hinzufügen"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Aus Favoriten entfernen"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Aus Favoriten entfernt"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Zu Favoriten hinzugefügt"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Bearbeiten"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Löschen"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Auf Startbildschirm platzieren"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Namen meiner Kontakte"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Für diese Aktion wurde keine App gefunden."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klicken Sie hier, um zum vorherigen Bildschirm zurückzukehren."</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefonnummer hinzufügen"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"E-Mail-Adresse hinzufügen"</string>
<string name="missing_app" msgid="1466111003546611387">"Für diese Aktion wurde keine App gefunden."</string>
<string name="menu_share" msgid="943789700636542260">"Teilen"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Zu Kontakten hinzufügen"</string>
<string name="share_via" msgid="563121028023030093">"Kontakt teilen über"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Konto für Gruppenerstellung"</string>
<string name="audio_chat" msgid="2535716629358298691">"Sprach-Chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Dieses Foto verwenden"</string>
<string name="contact_read_only" msgid="7421346527289472273">"In dieser App nicht bearbeitbar"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Keine Zusatzinformationen zu diesem Kontakt"</string>
<string name="group_read_only" msgid="1061762906115697637">"Auf diesem Gerät nicht bearbeitbar"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Liste sortieren nach"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Vorname"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nachname"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Kontaktnamen anzeigen"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vorname zuerst"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nachname zuerst"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto machen"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Neues Foto aufnehmen"</string>
<string name="pick_photo" msgid="2129509985223564942">"Foto auswählen"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Konto hinzufügen"</string>
<string name="add_new_account" msgid="5748627740680940264">"Neues Konto hinzufügen"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Datenbankdateien exportieren"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Bild. Zum Ändern auswählen"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"Neuen Kontakt hinzufügen"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Mehr anzeigen"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Weniger anzeigen"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Alle anzeigen"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Letzte"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Info"</string>
<string name="send_message" msgid="8938418965550543196">"Nachricht senden"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Persönliche Kopie wird erstellt…"</string>
<string name="yesterday" msgid="6840858548955018569">"Gestern"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ce4c977..496409b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Επαφές"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Επαφές"</string>
+ <string name="people" msgid="1190841469952343354">"Επαφές"</string>
<string name="contactsList" msgid="8661624236494819731">"Επαφές"</string>
<string name="shortcutContact" msgid="749243779392912958">"Επαφή"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Άμεση κλήση"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Επιλογή ενός αριθμού για κλήση"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Επιλογή ενός αριθμού για μήνυμα"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Επιλέξτε μια επαφή"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Δημιουργία νέας επαφής"</string>
<string name="starredList" msgid="4817256136413959463">"Με αστέρι"</string>
<string name="frequentList" msgid="7154768136473953056">"Συχνές"</string>
<string name="strequentList" msgid="5640192862059373511">"Αγαπ."</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Προβολή επαφής"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Προσθήκη στα αγαπημένα"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Κατάργηση από τα αγαπημένα"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Καταργήθηκε από τα αγαπημένα"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Προστέθηκε στα αγαπημένα"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Επεξεργασία"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Διαγραφή"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Τοποθέτηση στην αρχική οθόνη"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Ονόματα των επαφών σας"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Δεν βρέθηκε εφαρμογή για τη διαχείριση αυτής της ενέργειας."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Κάντε κλικ για να επιστρέψετε στην προηγούμενη οθόνη"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Προσθήκη αριθμού τηλεφώνου"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Προσθήκη email"</string>
<string name="missing_app" msgid="1466111003546611387">"Δεν βρέθηκε εφαρμογή για τη διαχείριση αυτής της ενέργειας."</string>
<string name="menu_share" msgid="943789700636542260">"Κοινή χρήση"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Προσθήκη στις επαφές"</string>
<string name="share_via" msgid="563121028023030093">"Κοινή χρήση μέσω"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Δημιουργία ομάδας στο λογαριασμό"</string>
<string name="audio_chat" msgid="2535716629358298691">"Φωνητική συνομιλία"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Χρήση αυτής της φωτογραφίας"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Αδυναμία επεξεργασ. από αυτήν την εφαρμ."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Δεν υπάρχουν πρόσθετες πληροφορίες για αυτήν την επαφή."</string>
<string name="group_read_only" msgid="1061762906115697637">"Αδυναμία επεξεργασίας στη συσκευή."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ταξινόμηση λίστας κατά"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Όνομα"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Επίθετο"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Προβολή ονομάτων επαφών"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Πρώτα το όνομα"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Πρώτα το επίθετο"</string>
<string name="take_photo" msgid="7496128293167402354">"Λήψη φωτογραφίας"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Λήψη νέας φωτογραφίας"</string>
<string name="pick_photo" msgid="2129509985223564942">"Επιλογή φωτογραφίας"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Προσθήκη λογαριασμού"</string>
<string name="add_new_account" msgid="5748627740680940264">"Προσθήκη νέου λογαριασμού"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Εξαγωγή αρχείων βάσης δεδομένων"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Εικόνα. Επιλέξτε για αλλαγή"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"προσθήκη νέας επαφής"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Δείτε περισσότερα"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Δείτε λιγότερα"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Εμφάνιση όλων"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Επικοινωνία"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Πρόσφατα"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Σχετικά με"</string>
<string name="send_message" msgid="8938418965550543196">"Αποστολή μηνύματος"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Δημιουργία προσωπικού αντιγράφου…"</string>
<string name="yesterday" msgid="6840858548955018569">"Χθες"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2615069..7d59f7e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contacts"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacts"</string>
+ <string name="people" msgid="1190841469952343354">"Contacts"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direct dial"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choose a number to call"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choose a number to message"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Choose a contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Create new contact"</string>
<string name="starredList" msgid="4817256136413959463">"Starred"</string>
<string name="frequentList" msgid="7154768136473953056">"Frequent"</string>
<string name="strequentList" msgid="5640192862059373511">"Favourites"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"View contact"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Add to favourites"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Remove from favourites"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Removed from favourites"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Added to favourites"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Delete"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Place on Home screen"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Add phone number"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Add email"</string>
<string name="missing_app" msgid="1466111003546611387">"No app was found to handle this action."</string>
<string name="menu_share" msgid="943789700636542260">"Share"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Add to contacts"</string>
<string name="share_via" msgid="563121028023030093">"Share contact via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Create group under account"</string>
<string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Use this photo"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Not editable from this app."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"No additional information for this contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Not editable on this device"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sort list by"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"First name"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Surname"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"View contact names"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"First name first"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Surname first"</string>
<string name="take_photo" msgid="7496128293167402354">"Take photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Take new photo"</string>
<string name="pick_photo" msgid="2129509985223564942">"Choose photo"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Add account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Picture. Select to change"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"add new contact"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"See more"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"See less"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"See all"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recent"</string>
- <string name="about_card_title" msgid="2920942314212825637">"About"</string>
<string name="send_message" msgid="8938418965550543196">"Send message"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creating a personal copy..."</string>
<string name="yesterday" msgid="6840858548955018569">"Yesterday"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2615069..7d59f7e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contacts"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacts"</string>
+ <string name="people" msgid="1190841469952343354">"Contacts"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direct dial"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choose a number to call"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choose a number to message"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Choose a contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Create new contact"</string>
<string name="starredList" msgid="4817256136413959463">"Starred"</string>
<string name="frequentList" msgid="7154768136473953056">"Frequent"</string>
<string name="strequentList" msgid="5640192862059373511">"Favourites"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"View contact"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Add to favourites"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Remove from favourites"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Removed from favourites"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Added to favourites"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Delete"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Place on Home screen"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Add phone number"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Add email"</string>
<string name="missing_app" msgid="1466111003546611387">"No app was found to handle this action."</string>
<string name="menu_share" msgid="943789700636542260">"Share"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Add to contacts"</string>
<string name="share_via" msgid="563121028023030093">"Share contact via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Create group under account"</string>
<string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Use this photo"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Not editable from this app."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"No additional information for this contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Not editable on this device"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sort list by"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"First name"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Surname"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"View contact names"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"First name first"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Surname first"</string>
<string name="take_photo" msgid="7496128293167402354">"Take photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Take new photo"</string>
<string name="pick_photo" msgid="2129509985223564942">"Choose photo"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Add account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Add new account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Export database files"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Picture. Select to change"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"add new contact"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"See more"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"See less"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"See all"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recent"</string>
- <string name="about_card_title" msgid="2920942314212825637">"About"</string>
<string name="send_message" msgid="8938418965550543196">"Send message"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creating a personal copy..."</string>
<string name="yesterday" msgid="6840858548955018569">"Yesterday"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e3faf85..354f2bb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contactos"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contactos"</string>
+ <string name="people" msgid="1190841469952343354">"Contactos"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Marcado directo"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Seleccionar un número para la llamada"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Seleccionar un número para el mensaje"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Seleccionar un contacto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear contacto nuevo"</string>
<string name="starredList" msgid="4817256136413959463">"Destacados"</string>
<string name="frequentList" msgid="7154768136473953056">"Frecuente"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritos"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ver contacto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Agregar a favoritos"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminar de favoritos"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Eliminado de favoritos"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Agregado a favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar en pantalla principal"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No se encontró ninguna aplicación que pueda realizar esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Haz clic para volver a la pantalla anterior."</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Agregar número de teléfono"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Agregar correo electrónico"</string>
<string name="missing_app" msgid="1466111003546611387">"No se encontró ninguna aplicación que pueda realizar esta acción."</string>
<string name="menu_share" msgid="943789700636542260">"Compartir"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Agregar a contactos"</string>
<string name="share_via" msgid="563121028023030093">"Compartir un contacto a través de"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Crear un grupo en la cuenta"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Usar esta foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"No se puede editar desde esta aplicación"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"No hay información adicional para este contacto."</string>
<string name="group_read_only" msgid="1061762906115697637">"No se puede editar en este dispositivo."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar listas por"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nombre"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apellido"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Ver nombres de contactos"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre Apellido"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellido Nombre"</string>
<string name="take_photo" msgid="7496128293167402354">"Tomar foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tomar nueva foto"</string>
<string name="pick_photo" msgid="2129509985223564942">"Elegir una foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Agregar una cuenta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Agregar una cuenta nueva"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar archivos de base de datos"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Fotografía. Seleccionar para cambiar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"agregar contacto nuevo"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ver más"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ver menos"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ver todo"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contacto"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Reciente"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Información"</string>
<string name="send_message" msgid="8938418965550543196">"Enviar mensaje"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creando una copia personal…"</string>
<string name="yesterday" msgid="6840858548955018569">"Ayer"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4b960ac..a720f9b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contactos"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contactos"</string>
+ <string name="people" msgid="1190841469952343354">"Contactos"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Llamada directa"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Elegir un número para la llamada"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Elegir un número para el mensaje"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Seleccionar un contacto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear nuevo contacto"</string>
<string name="starredList" msgid="4817256136413959463">"Destacados"</string>
<string name="frequentList" msgid="7154768136473953056">"Frecuentes"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritos"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ver contacto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Añadir a \"Favoritos\""</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminar de \"Favoritos\""</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Eliminado de favoritos"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Añadido a favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Añadir a la pantalla de inicio"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No se ha detectado ninguna aplicación que pueda hacer esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Haz clic para volver a la pantalla anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Añadir número de teléfono"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Añadir correo electrónico"</string>
<string name="missing_app" msgid="1466111003546611387">"No se ha detectado ninguna aplicación que pueda hacer esta acción."</string>
<string name="menu_share" msgid="943789700636542260">"Compartir"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Añadir a contactos"</string>
<string name="share_via" msgid="563121028023030093">"Compartir contacto a través de"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Crear grupo en cuenta"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizar esta foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"No se puede editar desde la aplicación."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"No hay información adicional para este contacto."</string>
<string name="group_read_only" msgid="1061762906115697637">"No se puede editar en este dispositivo."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar lista por"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nombre"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apellidos"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Ver nombres de contactos"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre primero"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellidos primero"</string>
<string name="take_photo" msgid="7496128293167402354">"Hacer una foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Hacer una foto nueva"</string>
<string name="pick_photo" msgid="2129509985223564942">"Elegir foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Añadir cuenta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Añadir una cuenta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar archivos de base de datos"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Imagen. Seleccionar para cambiar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"añadir nuevo contacto"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ver más"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ver menos"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ver todo"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contacto"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recientes"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Información"</string>
<string name="send_message" msgid="8938418965550543196">"Enviar mensaje"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creando una copia personal..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ayer"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 5013d91..c1ff5e9 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktid"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktid"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktid"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontaktid"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Otsevalimine"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Valige helistamiseks number"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Valige sõnumi jaoks number"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontakti valimine"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Loo uus kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Tärniga"</string>
<string name="frequentList" msgid="7154768136473953056">"Sagedane"</string>
<string name="strequentList" msgid="5640192862059373511">"Lemmikud"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Kuva kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Lisa lemmikutesse"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eemalda lemmikutest"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Lemmikutest eemaldatud"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Lemmikutesse lisatud"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Muuda"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Kustuta"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Paiguta avalehele"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Teie kontaktide nimed"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Selle toimingu käsitsemiseks ei leitud ühtegi rakendust."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klõpsake eelmisele ekraanikuvale naasmiseks"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Lisage telefoninumber"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Lisage e-posti aadress"</string>
<string name="missing_app" msgid="1466111003546611387">"Selle toimingu käsitlemiseks ei leitud ühtegi rakendust."</string>
<string name="menu_share" msgid="943789700636542260">"Jaga"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Lisa kontaktide hulka"</string>
<string name="share_via" msgid="563121028023030093">"Kontakti jagamisvalikud"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Kontopõhise grupi loomine"</string>
<string name="audio_chat" msgid="2535716629358298691">"Häälvestlus"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Kasuta seda fotot"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ei saa muuta selles rakenduses."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Selle kontakti kohta pole täiendavat teavet."</string>
<string name="group_read_only" msgid="1061762906115697637">"Ei saa muuta selles seadmes."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Loendi sortimisalus"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Eesnimi"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Perekonnanimi"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Kuva kontaktid"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Eesnimi kõigepealt"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Perekonnanimi kõigepealt"</string>
<string name="take_photo" msgid="7496128293167402354">"Tee foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tee uus foto"</string>
<string name="pick_photo" msgid="2129509985223564942">"Vali foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Lisa konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisa uus konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Andmebaasi failide eksportimine"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Pilt. Muutmiseks valige"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"uue kontakti lisamine"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Lisateave"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kuva vähem"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Kuva kõik"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Hiljutine"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Teave"</string>
<string name="send_message" msgid="8938418965550543196">"Saada sõnum"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Isikliku koopia loomine ..."</string>
<string name="yesterday" msgid="6840858548955018569">"Eile"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index c2192fb..159fa0a 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktuak"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktuak"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktuak"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontaktuak"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontaktua"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Markatze zuzena"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Aukeratu deitzeko zenbaki bat"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Aukeratu testu-mezua bidaltzeko zenbaki bat"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Aukeratu kontaktu bat"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Sortu kontaktua"</string>
<string name="starredList" msgid="4817256136413959463">"Izardunak"</string>
<string name="frequentList" msgid="7154768136473953056">"Sarri"</string>
<string name="strequentList" msgid="5640192862059373511">"Gogokoak"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ikusi kontaktua"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Gehitu gogokoetan"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Kendu gogokoetatik"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Gogokoetatik kendu da"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Gogokoetan gehitu da"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editatu"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ezabatu"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Jarri hasierako pantailan"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktuen izenak"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ez da ekintza kudeatzeko aplikaziorik aurkitu."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Egin klik hemen aurreko pantailara itzultzeko"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Gehitu telefono-zenbakia"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Gehitu helbide elektronikoa"</string>
<string name="missing_app" msgid="1466111003546611387">"Ez da ekintza kudeatzeko aplikaziorik aurkitu."</string>
<string name="menu_share" msgid="943789700636542260">"Partekatu"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Gehitu kontaktuetan"</string>
<string name="share_via" msgid="563121028023030093">"Partekatu kontaktua honen bidez:"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Sortu taldea kontuaren barruan"</string>
<string name="audio_chat" msgid="2535716629358298691">"Ahots-txata"</string>
@@ -132,12 +125,19 @@
<string name="add_connection_button" msgid="4861308615789601727">"Gehitu konexioa"</string>
<string name="recent" msgid="2659189233141493004">"Azkenak"</string>
<string name="recent_updates" msgid="4267258535615860710">"Azken berritasunak"</string>
- <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> kontaktua"</string>
+ <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> iturburuko kontaktua"</string>
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Erabili argazki hau"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ezin da aplikazio honen bidez editatu."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Kontaktuak ez du informazio gehigarririk."</string>
<string name="group_read_only" msgid="1061762906115697637">"Ezin da gailu honetan editatu."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenatu zerrenda honen arabera"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Izena"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Abizena"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Ikusi kontaktuen izenak"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Izena lehenago"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Abizena lehenago"</string>
<string name="take_photo" msgid="7496128293167402354">"Atera argazkia"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Atera beste argazki bat"</string>
<string name="pick_photo" msgid="2129509985223564942">"Aukeratu argazkia"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Gehitu kontua"</string>
<string name="add_new_account" msgid="5748627740680940264">"Gehitu beste kontu bat"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Esportatu datu-baseko fitxategiak"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Irudia. Aldatzeko, hautatu."</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"gehitu kontaktu berri bat"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ikusi gehiago"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ikusi gutxiago"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ikusi guztiak"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontaktua"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Azkenak"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Honi buruz"</string>
<string name="send_message" msgid="8938418965550543196">"Bidali mezua"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Kopia pertsonala sortzen…"</string>
<string name="yesterday" msgid="6840858548955018569">"Atzo"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8f4ffe2..58da306 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"مخاطبین"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"مخاطبین"</string>
+ <string name="people" msgid="1190841469952343354">"مخاطبین"</string>
<string name="contactsList" msgid="8661624236494819731">"مخاطبین"</string>
<string name="shortcutContact" msgid="749243779392912958">"مخاطب"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"شماره گیری مستقیم"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"انتخاب یک شماره برای تماس"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"انتخاب یک شماره برای پیام"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"انتخاب یک مخاطب"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ایجاد مخاطب جدید"</string>
<string name="starredList" msgid="4817256136413959463">"ستارهدار"</string>
<string name="frequentList" msgid="7154768136473953056">"مکرر"</string>
<string name="strequentList" msgid="5640192862059373511">"موارد دلخواه"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"مشاهده مخاطب"</string>
<string name="menu_addStar" msgid="2908478235715404876">"افزودن به موارد دلخواه"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"حذف از موارد دلخواه"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"از موارد دلخواه حذف میشود"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"به موارد دلخواه افزوده میشود"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ویرایش"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"حذف"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"محل بر روی صفحهٔ اصلی"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"نامهای مخاطبین شما"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"برنامهای برای انجام این عملکرد یافت نشد."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"برای بازگشت به صفحه قبلی کلیک کنید"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"افزودن شماره تلفن"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"افزودن ایمیل"</string>
<string name="missing_app" msgid="1466111003546611387">"برنامهای برای انجام این عملکرد یافت نشد."</string>
<string name="menu_share" msgid="943789700636542260">"اشتراکگذاری"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"افزودن به مخاطبین"</string>
<string name="share_via" msgid="563121028023030093">"اشتراکگذاری مخاطب از طریق"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ایجاد گروه تحت حساب کاربری"</string>
<string name="audio_chat" msgid="2535716629358298691">"گپ صوتی"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"استفاده از این عکس"</string>
<string name="contact_read_only" msgid="7421346527289472273">"از این برنامه قابل ویرایش نیست."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"اطلاعات دیگری برای این مخاطب موجود نیست."</string>
<string name="group_read_only" msgid="1061762906115697637">"در این دستگاه قابل ویرایش نیست."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"مرتب سازی لیست بر اساس"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"نام"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"نام خانوادگی"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"مشاهده نام مخاطبین"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ابتدا نام"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ابتدا نام خانوادگی"</string>
<string name="take_photo" msgid="7496128293167402354">"عکسبرداری"</string>
<string name="take_new_photo" msgid="7341354729436576304">"گرفتن عکس جدید"</string>
<string name="pick_photo" msgid="2129509985223564942">"انتخاب عکس"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"افزودن حساب"</string>
<string name="add_new_account" msgid="5748627740680940264">"اافزودن حساب جدید"</string>
<string name="menu_export_database" msgid="2659719297530170820">"صدور فایلهای پایگاه داده"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"عکس. جهت تغییر انتخاب کنید"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"افزودن مخاطب جدید"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"مشاهده موارد بیشتر"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"مشاهده موارد کمتر"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"مشاهده همه"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"مخاطب"</string>
<string name="recent_card_title" msgid="8982782042698001695">"اخیر"</string>
- <string name="about_card_title" msgid="2920942314212825637">"درباره"</string>
<string name="send_message" msgid="8938418965550543196">"ارسال پیام"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"در حال ایجاد یک کپی شخصی..."</string>
<string name="yesterday" msgid="6840858548955018569">"دیروز"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f3408aa..7257d02 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Yhteystiedot"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Yhteystiedot"</string>
+ <string name="people" msgid="1190841469952343354">"Yhteystiedot"</string>
<string name="contactsList" msgid="8661624236494819731">"Yhteystiedot"</string>
<string name="shortcutContact" msgid="749243779392912958">"Yhteystieto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Puhelu"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Valitse vastaanottajan numero"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Valitse vastaanottajan numero"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Valitse yhteystieto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Luo uusi yhteystieto"</string>
<string name="starredList" msgid="4817256136413959463">"Tähdelliset"</string>
<string name="frequentList" msgid="7154768136473953056">"Usein käytetyt"</string>
<string name="strequentList" msgid="5640192862059373511">"Suosikit"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Näytä yhteystieto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Lisää suosikkeihin"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Poista suosikeista"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Poistettu suosikeista"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Lisätty suosikkeihin"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Muokkaa"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Poista"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Paikka aloitusruudussa"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Yhteystietojen nimet"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tätä toimintoa käsittelevää sovellusta ei löydy."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Palaa edelliseen näyttöön klikkaamalla"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Lisää puhelinnumero"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Lisää sähköposti"</string>
<string name="missing_app" msgid="1466111003546611387">"Tätä toimintoa käsittelevää sovellusta ei löydy."</string>
<string name="menu_share" msgid="943789700636542260">"Jaa"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Lisää yhteystietoihin"</string>
<string name="share_via" msgid="563121028023030093">"Jaa yhteystieto"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Luo ryhmä tilissä"</string>
<string name="audio_chat" msgid="2535716629358298691">"Äänikeskustelu"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Käytä valokuvaa"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ei muokattavissa tästä sovelluksesta."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Tässä yhteystiedossa ei ole muita tietoja."</string>
<string name="group_read_only" msgid="1061762906115697637">"Ei muokattavissa tällä laitteella."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Luettelon lajittelutapa"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Etunimi"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sukunimi"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Näytä kontaktien nimet"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Etunimi ensin"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sukunimi ensin"</string>
<string name="take_photo" msgid="7496128293167402354">"Ota valokuva"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ota uusi kuva"</string>
<string name="pick_photo" msgid="2129509985223564942">"Valitse valokuva"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Lisää tili"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisää uusi tili"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Vie tietokantatiedostot"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Kuva. Vaihda valitsemalla"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"lisää uusi kontakti"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Näytä enemmän"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Näytä vähemmän"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Näytä kaikki"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakti"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Viimeisimmät"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Tietoja"</string>
<string name="send_message" msgid="8938418965550543196">"Lähetä viesti"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Luodaan oma kopio…"</string>
<string name="yesterday" msgid="6840858548955018569">"Eilen"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Nimetön tapahtuma)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Käytä"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"Pikaviesti"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"Organisaatio"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Lempinimi"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"Muistiinpano"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"Sivusto"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"Tapahtuma"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"Suhde"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"reittiohjeet sijaintiin"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"viimeaikainen tekstiviesti. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Vastaa klikkaamalla."</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"saapuva"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"lähtevä"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"vastaamaton"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"viimeaikainen puhelu. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Soita takaisin klikkaamalla."</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"Sinä: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 27eb930..e5cd90f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contacts"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacts"</string>
+ <string name="people" msgid="1190841469952343354">"Contacts"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Raccourci appel"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choisissez le numéro à appeler"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choisissez le numéro auquel envoyer le message"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Sélectionner un contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Créer un contact"</string>
<string name="starredList" msgid="4817256136413959463">"Favoris"</string>
<string name="frequentList" msgid="7154768136473953056">"Contacts fréquents"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoris"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Afficher le contact"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Ajouter aux favoris"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Supprimer des favoris"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Supprimé des favoris"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Ajouté aux favoris"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Modifier"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Supprimer"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placer sur l\'écran d\'accueil"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Noms de vos contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aucune application pouvant gérer cette action n\'a été trouvée."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Cliquez ici pour revenir à l\'écran précédent"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Ajouter un numéro de téléphone"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Ajouter une adresse de courriel"</string>
<string name="missing_app" msgid="1466111003546611387">"Aucune application pouvant gérer cette action n\'a été trouvée."</string>
<string name="menu_share" msgid="943789700636542260">"Partager"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Ajouter aux contacts"</string>
<string name="share_via" msgid="563121028023030093">"Partager contact via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Sélectionner le compte associé au groupe"</string>
<string name="audio_chat" msgid="2535716629358298691">"Clavardage audio"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utiliser cette photo"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Non modifiable depuis cette application."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Aucune autre information n\'est disponible pour ce contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Non modifiable sur cet appareil."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Trier la liste par"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prénom"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nom"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Afficher les noms des contacts"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Le prénom en premier"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Le nom en premier"</string>
<string name="take_photo" msgid="7496128293167402354">"Prendre une photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Prendre une autre photo"</string>
<string name="pick_photo" msgid="2129509985223564942">"Choisir une photo"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Ajouter un compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ajouter un nouveau compte"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporter les fichiers de la base de données"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Image. Sélectionner pour modifier."</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ajouter un contact"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"En voir plus"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"En voir moins"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Tout afficher"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Récents"</string>
- <string name="about_card_title" msgid="2920942314212825637">"À propos"</string>
<string name="send_message" msgid="8938418965550543196">"Envoyer un message"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Création d\'une copie personnelle en cours..."</string>
<string name="yesterday" msgid="6840858548955018569">"Hier"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cc357e6..a451d6e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contacts"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacts"</string>
+ <string name="people" msgid="1190841469952343354">"Contacts"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacts"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Raccourci appel"</string>
@@ -26,8 +25,7 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Choisissez le numéro à appeler"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Choisissez le numéro auquel envoyer le message"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Sélectionner un contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Créer un contact"</string>
- <string name="starredList" msgid="4817256136413959463">"Favoris"</string>
+ <string name="starredList" msgid="4817256136413959463">"Marqués d\'une étoile"</string>
<string name="frequentList" msgid="7154768136473953056">"Contacts fréquents"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoris"</string>
<string name="viewContactTitle" msgid="7989394521836644384">"Détails du contact"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Afficher le contact"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Ajouter aux favoris"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Supprimer des favoris"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Supprimé des favoris"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Ajouté aux favoris"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Modifier"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Supprimer"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placer sur l\'écran d\'accueil"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Noms de vos contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aucune application pouvant gérer cette action n\'a été trouvée."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Cliquez pour revenir à l\'écran précédent."</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Ajouter un numéro de téléphone"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Ajouter une adresse e-mail"</string>
<string name="missing_app" msgid="1466111003546611387">"Aucune application trouvée pour gérer cette action."</string>
<string name="menu_share" msgid="943789700636542260">"Partager"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Ajouter aux contacts"</string>
<string name="share_via" msgid="563121028023030093">"Partager contact via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Sélectionner le compte associé au groupe"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat audio"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utiliser cette photo"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Non modifiable depuis cette application."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Aucune autre information n\'est disponible pour ce contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Non modifiable sur cet appareil."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Trier la liste par"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prénom"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nom"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Afficher les noms des contacts"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Le prénom en premier"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Le nom en premier"</string>
<string name="take_photo" msgid="7496128293167402354">"Prendre une photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Prendre une autre photo"</string>
<string name="pick_photo" msgid="2129509985223564942">"Sélectionner une photo"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Ajouter un compte"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ajouter un compte"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exporter les fichiers de la base de données"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Image : sélectionner pour modifier"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ajouter un contact"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Plus"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Moins"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Tout afficher"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Récents"</string>
- <string name="about_card_title" msgid="2920942314212825637">"À propos de"</string>
<string name="send_message" msgid="8938418965550543196">"Envoyer le message"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Création d\'une copie personnelle en cours..."</string>
<string name="yesterday" msgid="6840858548955018569">"Hier"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 1290503..f68887f 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -16,17 +16,15 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contactos"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contactos"</string>
+ <string name="people" msgid="1190841469952343354">"Contactos"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Marcación directa"</string>
<string name="shortcutMessageContact" msgid="2460337253595976198">"Mensaxe directa"</string>
- <string name="shortcutActivityTitle" msgid="6642877210643565436">"Seleccionar un atallo para o contacto"</string>
+ <string name="shortcutActivityTitle" msgid="6642877210643565436">"Escolle un atallo do contacto"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Escolle un número ao que chamar"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Escolle un número ao que enviar unha mensaxe"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Seleccionar un contacto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear novo contacto"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Escolle un contacto"</string>
<string name="starredList" msgid="4817256136413959463">"Marcados con asterisco"</string>
<string name="frequentList" msgid="7154768136473953056">"Frecuentes"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritos"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ver contacto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Engadir a favoritos"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminar dos favoritos"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Eliminado de favoritos"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Engadido a favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar na pantalla de inicio"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos teus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Non se encontrou ningunha aplicación para procesar esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fai clic para volver á pantalla anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Engadir número de teléfono"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Engadir correo electrónico"</string>
<string name="missing_app" msgid="1466111003546611387">"Non se encontrou ningunha aplicación para procesar esta acción."</string>
<string name="menu_share" msgid="943789700636542260">"Compartir"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Engadir a contactos"</string>
<string name="share_via" msgid="563121028023030093">"Compartir contacto mediante"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Crear grupo na conta"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizar esta foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Non editable desde esta aplicación."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Non hai información adicional para este contacto."</string>
<string name="group_read_only" msgid="1061762906115697637">"Non editable neste dispositivo"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar lista por"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apelidos"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Ver nomes de contacto"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome primeiro"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelidos primeiro"</string>
<string name="take_photo" msgid="7496128293167402354">"Facer foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Facer foto nova"</string>
<string name="pick_photo" msgid="2129509985223564942">"Escoller foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Engadir conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Engadir conta nova"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar ficheiros da base de datos"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Imaxe. Seleccionar para cambiar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"engadir novo contacto"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ver máis"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ver menos"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ver todo"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contacto"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recente"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Acerca de"</string>
<string name="send_message" msgid="8938418965550543196">"Enviar mensaxe"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creando unha copia persoal..."</string>
<string name="yesterday" msgid="6840858548955018569">"Onte"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7e44c90..fdb7b2c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,17 +16,15 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"संपर्क"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"संपर्क"</string>
+ <string name="people" msgid="1190841469952343354">"संपर्क"</string>
<string name="contactsList" msgid="8661624236494819731">"संपर्क"</string>
<string name="shortcutContact" msgid="749243779392912958">"संपर्क"</string>
- <string name="shortcutDialContact" msgid="746622101599186779">"कॉल करें"</string>
- <string name="shortcutMessageContact" msgid="2460337253595976198">"मैसेज भेजें"</string>
+ <string name="shortcutDialContact" msgid="746622101599186779">"प्रत्यक्ष डायल"</string>
+ <string name="shortcutMessageContact" msgid="2460337253595976198">"प्रत्यक्ष संदेश"</string>
<string name="shortcutActivityTitle" msgid="6642877210643565436">"कोई संपर्क शॉर्टकट चुनें"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"कॉल करने के लिए कोई नंबर चुनें"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"संदेश भेजने के लिए कोई नंबर चुनें"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"कोई संपर्क चुनें"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"नया संपर्क बनाएं"</string>
<string name="starredList" msgid="4817256136413959463">"तारांकित"</string>
<string name="frequentList" msgid="7154768136473953056">"बार-बार"</string>
<string name="strequentList" msgid="5640192862059373511">"पसंदीदा"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"संपर्क देखें"</string>
<string name="menu_addStar" msgid="2908478235715404876">"पसंदीदा में जोड़ें"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"पसंदीदा से निकालें"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"पसंदीदा से निकाल दिया गया"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"पसंदीदा में जोड़ा गया"</string>
<string name="menu_editContact" msgid="9042415603857662633">"संपादित करें"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"हटाएं"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"मुख्यपृष्ठ स्क्रीन पर रखें"</string>
@@ -68,7 +64,7 @@
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"इस संपर्क में एकाधिक खातों की जानकारी है. केवल-पढ़ने के लिए खातों की जानकारी आपकी संपर्क सूचियों में छिपी रहेगी, उसे हटाया नहीं जाएगा."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"इस संपर्क को हटाने से एकाधिक खातों से जानकारी हट जाएगी."</string>
<string name="deleteConfirmation" msgid="811706994761610640">"यह संपर्क हटा दिया जाएगा."</string>
- <string name="menu_discard" msgid="6854657936970228164">"परिवर्तन हटा दें"</string>
+ <string name="menu_discard" msgid="6854657936970228164">"बदलावों को छोड़ें"</string>
<string name="invalidContactMessage" msgid="8215051456181842274">"संपर्क मौजूद नहीं है."</string>
<string name="createContactShortcutSuccessful" msgid="7874133287558150877">"मुख्यपृष्ठ स्क्रीन पर संपर्क विजेट जोड़ा गया."</string>
<string name="pickerNewContactHeader" msgid="7750705279843568147">"नया संपर्क बनाएं"</string>
@@ -81,7 +77,7 @@
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"फ़ोन पर कोई चित्र उपलब्ध नहीं है."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"संपर्क का फ़ोटो"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"कस्टम लेबल नाम"</string>
- <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"सीधे वॉयस मेल पर कॉल भेजें"</string>
+ <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"सीधे ध्वनिमेल पर कॉल भेजें"</string>
<string name="removePhoto" msgid="4898105274130284565">"फ़ोटो निकालें"</string>
<string name="noContacts" msgid="8579310973261953559">"कोई संपर्क नहीं."</string>
<string name="noGroups" msgid="8614664663561385253">"कोई समूह नहीं."</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"आपके संपर्कों के नाम"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"यह कार्यवाही प्रबंधित करने के लिए कोई ऐप्स नहीं मिला."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"पिछली स्क्रीन पर लौटने के लिए क्लिक करें"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"फ़ोन नंबर जोड़ें"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ईमेल जोड़ें"</string>
<string name="missing_app" msgid="1466111003546611387">"यह कार्यवाही प्रबंधित करने के लिए कोई ऐप्स नहीं मिला."</string>
<string name="menu_share" msgid="943789700636542260">"साझा करें"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"संपर्कों में जोड़ें"</string>
<string name="share_via" msgid="563121028023030093">"इसके द्वारा संपर्क साझा करें"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"खाते के तहत समूह बनाएं"</string>
<string name="audio_chat" msgid="2535716629358298691">"ध्वनि बातचीत"</string>
@@ -137,21 +130,28 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"इस फ़ोटो का उपयोग करें"</string>
<string name="contact_read_only" msgid="7421346527289472273">"इस ऐप्स द्वारा संपादन-योग्य नहीं."</string>
- <string name="group_read_only" msgid="1061762906115697637">"इस डिवाइस पर संपादन योग्य नहीं."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"इस संपर्क की कोई अतिरिक्त जानकारी नहीं है."</string>
+ <string name="group_read_only" msgid="1061762906115697637">"इस उपकरण पर संपादन योग्य नहीं."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"सूची को इसके अनुसार क्रमित करें"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"दिया गया नाम"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"उपनाम"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"संपर्क नामों को देखें"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"दिया गया नाम पहले"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"कुलनाम पहले"</string>
<string name="take_photo" msgid="7496128293167402354">"फ़ोटो लें"</string>
<string name="take_new_photo" msgid="7341354729436576304">"नया फ़ोटो लें"</string>
<string name="pick_photo" msgid="2129509985223564942">"फ़ोटो चुनें"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"नई फ़ोटो चुनें"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"भाषा के परिवर्तन दिखाने के लिए संपर्क सूची से नई जानकारी मिल रही है."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"संपर्क सूची से नई जानकारी मिल रही है."</string>
- <string name="upgrade_out_of_memory" msgid="1209994418877625940">"संपर्क अपग्रेड होने की प्रक्रिया में हैं. \n\nअपग्रेड प्रक्रिया को लगभग <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB मोबाइल मेमोरी की आवश्यकता होती है.\n\nनिम्न विकल्पों में से कोई एक चुनें:"</string>
+ <string name="upgrade_out_of_memory" msgid="1209994418877625940">"संपर्क अपग्रेड होने की प्रक्रिया में हैं. \n\nअपग्रेड प्रक्रिया को लगभग <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB मोबाइल संग्रहण की आवश्यकता होती है.\n\nनिम्न विकल्पों में से कोई एक चुनें:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"कुछ ऐप्स अनइंस्टॉल करें"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"अपग्रेड का पुन: प्रयास करें"</string>
<string name="search_results_searching" msgid="3984833028938569930">"खोज रहा है…"</string>
<string name="menu_display_selected" msgid="6470001164297969034">"चयनित दिखाएं"</string>
<string name="menu_display_all" msgid="8887488642609786198">"सभी दिखाएं"</string>
<string name="menu_select_all" msgid="621719255150713545">"सभी को चुनें"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"कुछ भी ना चुनें"</string>
+ <string name="menu_select_none" msgid="7093222469852132345">"सभी का चयन रद्द करें"</string>
<string name="add_field" msgid="2384260056674995230">"दूसरा फ़ील्ड जोड़ें"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"नया जोड़ें"</string>
<string name="add_organization" msgid="7311893231158291197">"संगठन जोड़ें"</string>
@@ -179,7 +179,7 @@
<string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"संपर्क में जोड़ें"</string>
<string name="non_phone_close" msgid="7608506439725515667">"बंद करें"</string>
<string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
- <string name="date_year_toggle" msgid="7356532842767854606">"वर्ष दिखाएं"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"वर्ष दर्शाएं"</string>
<string name="social_widget_label" msgid="6378905543028924592">"संपर्क करें"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"लोड हो रहा है..."</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"एक नया संपर्क बनाएं"</string>
@@ -204,8 +204,8 @@
<string name="copy_text" msgid="3257145021583508761">"क्लिपबोर्ड पर प्रतिलिपि बनाएं"</string>
<string name="set_default" msgid="4417505153468300351">"सामान्य सेट करें"</string>
<string name="clear_default" msgid="7193185801596678067">"सामान्य साफ़ करें"</string>
- <string name="toast_text_copied" msgid="5143776250008541719">"लेख की प्रतिलिपि बनाई गई"</string>
- <string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"आपके परिवर्तन हटा दें?"</string>
+ <string name="toast_text_copied" msgid="5143776250008541719">"पाठ की प्रतिलिपि बनाई गई"</string>
+ <string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"आपके परिवर्तन छोड़ें?"</string>
<string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"मेरी प्रोफ़ाइल सेट करें"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"व्यक्ति का नाम लिखें"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"खाता जोड़ें"</string>
<string name="add_new_account" msgid="5748627740680940264">"नया खाता जोड़ें"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फ़ाइलें निर्यात करें"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"चित्र. बदलने के लिए चुनें"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"नया संपर्क जोड़ें"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"अधिक देखें"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कम देखें"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"सभी देखें"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"संपर्क"</string>
<string name="recent_card_title" msgid="8982782042698001695">"हाल ही का"</string>
- <string name="about_card_title" msgid="2920942314212825637">"संक्षिप्त विवरण"</string>
<string name="send_message" msgid="8938418965550543196">"संदेश भेजें"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"व्यक्तिगत प्रति बनाई जा रही है..."</string>
<string name="yesterday" msgid="6840858548955018569">"कल"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 792fdc8..146c70c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakti"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakti"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakti"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakti"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Izravan poziv"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Odaberite broj za pozivanje"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Odabir broja za poruku"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odaberite kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Izrada novog kontakta"</string>
<string name="starredList" msgid="4817256136413959463">"Sa zvjezdicom"</string>
<string name="frequentList" msgid="7154768136473953056">"Često"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoriti"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Prikaži kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Dodaj u favorite"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Ukloni iz favorita"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Uklonjeno iz favorita"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Dodano favoritima"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Uredi"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Mjesto na početnom zaslonu"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nazivi vaših kontakata"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nije pronađena nijedna aplikacija koja može provesti ovu radnju."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknite za povratak na prethodni zaslon"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Dodajte telefonski broj"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Dodajte e-adresu"</string>
<string name="missing_app" msgid="1466111003546611387">"Nije pronađena nijedna aplikacija koja može provesti tu radnju."</string>
<string name="menu_share" msgid="943789700636542260">"Podijeli"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Dodaj u kontakte"</string>
<string name="share_via" msgid="563121028023030093">"Dijeli kontakt putem"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Napravite skupinu pod računom"</string>
<string name="audio_chat" msgid="2535716629358298691">"Glasovni chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Upotrijebi ovu fotografiju"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Iz ove aplikacije ne može se uređivati."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nema dodatnih podataka za ovaj kontakt."</string>
<string name="group_read_only" msgid="1061762906115697637">"Na ovom uređaju ne može se uređivati"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Poredaj popis prema"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ime"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Prezime"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Prikaži imena kontakata"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprije ime"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprije prezime"</string>
<string name="take_photo" msgid="7496128293167402354">"Snimi fotografiju"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Snimi novu fotografiju"</string>
<string name="pick_photo" msgid="2129509985223564942">"Odaberite fotografiju"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Dodaj račun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj novi račun"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvezi datoteke podatkovne baze"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Slika. Odaberite za promjenu"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"dodavanje novog kontakta"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Pokaži više"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Pokaži manje"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Pokaži sve"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nedavno"</string>
- <string name="about_card_title" msgid="2920942314212825637">"O kartici"</string>
<string name="send_message" msgid="8938418965550543196">"Pošalji poruku"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Izrada osobne kopije..."</string>
<string name="yesterday" msgid="6840858548955018569">"Jučer"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bbc2df8..ccbe800 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Névjegyek"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Névjegyek"</string>
+ <string name="people" msgid="1190841469952343354">"Névjegyek"</string>
<string name="contactsList" msgid="8661624236494819731">"Címtár"</string>
<string name="shortcutContact" msgid="749243779392912958">"Névjegy"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Közvetlen tárcsázás"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Válasszon telefonszámot a híváshoz"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Válasszon telefonszámot az üzenetküldéshez"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Névjegy kiválasztása"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Új névjegy létrehozása"</string>
<string name="starredList" msgid="4817256136413959463">"Csillaggal megjelölt"</string>
<string name="frequentList" msgid="7154768136473953056">"Gyakori"</string>
<string name="strequentList" msgid="5640192862059373511">"Kedvencek"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Névjegy megtekintése"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Hozzáadás a kedvencekhez"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eltávolítás a kedvencek közül"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Eltávolítva a kedvencek közül"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Hozzáadva a kedvencekhez"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Szerkesztés"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Törlés"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Helyezze el a kezdőképernyőn"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Ismerősök nevei"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kattintással visszatér az előző képernyőre"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefonszám hozzáadása"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"E-mail cím hozzáadása"</string>
<string name="missing_app" msgid="1466111003546611387">"Nincs megfelelő alkalmazás a művelet elvégzéséhez."</string>
<string name="menu_share" msgid="943789700636542260">"Megosztás"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Hozzáadás a névjegyekhez"</string>
<string name="share_via" msgid="563121028023030093">"Névjegy megosztása a következőn:"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Csoport létrehozása a fiókban"</string>
<string name="audio_chat" msgid="2535716629358298691">"Audiocsevegés"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Fotó felhasználása"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nem szerkeszthető ezen alkalmazásból."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nincsenek további adatok ennél a névjegynél."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nem szerkeszthető ezen a készüléken"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Lista rendezési elve:"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Utónév"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Vezetéknév"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Névjegyek megtekintése"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Utónév előre"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vezetéknév elöl"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotó készítése"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Új fénykép készítése"</string>
<string name="pick_photo" msgid="2129509985223564942">"Fotó kiválasztása"</string>
@@ -201,7 +201,7 @@
<item quantity="other" msgid="6251996206137048525">"<xliff:g id="COUNT">%1$d</xliff:g> személy"</item>
</plurals>
<string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Írja be az ismerős nevét, mielőtt összekapcsolná egy másik ismerősével."</string>
- <string name="copy_text" msgid="3257145021583508761">"Másolás vágólapra"</string>
+ <string name="copy_text" msgid="3257145021583508761">"Másolás a vágólapra"</string>
<string name="set_default" msgid="4417505153468300351">"Beállítás alapértelmezettként"</string>
<string name="clear_default" msgid="7193185801596678067">"Alapértelmezés törlése"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Másolt szöveg"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Fiók hozzáadása"</string>
<string name="add_new_account" msgid="5748627740680940264">"Új fiók hozzáadása"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Adatbázisfájlok exportálása"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Kép. Válassza ki a módosításhoz"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"új névjegy hozzáadása"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Továbbiak"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kevesebb megjelenítése"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Az összes megjelenítése"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Névjegy"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Legutóbbiak"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Névjegy"</string>
<string name="send_message" msgid="8938418965550543196">"Üzenet küldése"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Személyes másolat létrehozása…"</string>
<string name="yesterday" msgid="6840858548955018569">"Tegnap"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 1d0eb73..c925c46 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Կոնտակտներ"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Կոնտակտներ"</string>
+ <string name="people" msgid="1190841469952343354">"Կոնտակտներ"</string>
<string name="contactsList" msgid="8661624236494819731">"Կոնտակտներ"</string>
<string name="shortcutContact" msgid="749243779392912958">"Կոնտակտ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Ուղիղ համարհավաքում"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Ընտրել զանգելու համարը"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Ընտրել համարը՝ հաղորդագրելու համար"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Ընտրել կոնտակտ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ստեղծել նոր կոնտակտ"</string>
<string name="starredList" msgid="4817256136413959463">"Աստղանշված"</string>
<string name="frequentList" msgid="7154768136473953056">"Հաճախակի"</string>
<string name="strequentList" msgid="5640192862059373511">"Ընտրյալներ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Դիտել կոնտակտը"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Ավելացնել ընտրյալներում"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Հեռացնել ընտրյալներից"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Հեռացված է ընտրյալներից"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Ավելացված է ընտրյալներում"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Խմբագրել"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ջնջել"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Տեղադրել գլխավոր էկրանին"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Ձեր կոնտակտների անունները"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Այս գործողությունը կատարելու համար ոչ մի ծրագիր չի գտնվել:"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Սեղմեք՝ նախորդ էկրանին վերադառնալու համար"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Ավելացնել հեռախոսահամար"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Ավելացնել էլփոստ"</string>
<string name="missing_app" msgid="1466111003546611387">"Այս գործողությունը կատարելու համար ոչ մի ծրագիր չի գտնվել:"</string>
<string name="menu_share" msgid="943789700636542260">"Տարածել"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Ավելացնել կոնտակտներում"</string>
<string name="share_via" msgid="563121028023030093">"Տարածել կոնտակտը"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Ստեղծել խումբ հաշվի ներքևում"</string>
<string name="audio_chat" msgid="2535716629358298691">"Ձայնային զրույց"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Օգտագործել այս լուսանկարը"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ենթակա չէ խմբագրման այս ծրագրով:"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Այս կոնտակտի համար չկան հավելյալ տվյալներ:"</string>
<string name="group_read_only" msgid="1061762906115697637">"Խմբագրելի չէ այս սարքից:"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Դասավորել ցանկը ըստ"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Անունի"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Ազգանունի"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Դիտել կոնտակտի անունները"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Առաջինը՝ անունը"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Առաջինը՝ ազգանունը"</string>
<string name="take_photo" msgid="7496128293167402354">"Լուսանկարել"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Լուսանկարել նորը"</string>
<string name="pick_photo" msgid="2129509985223564942">"Ընտրել լուսանկար"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Ավելացնել հաշիվ"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ավելացնել նոր հաշիվ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Արտահանել տվյալների շտեմարանի ֆայլերը"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Նկար: Ընտրեք՝ փոխելու համար"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ավելացնել նոր կոնտակտ"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Տեսնել ավելին"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Տեսնել պակաս"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Տեսնել բոլորը"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Կոնտակտ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Վերջին գործողությունները"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Տեղեկատվություն"</string>
<string name="send_message" msgid="8938418965550543196">"Ուղարկել հաղորդագրություն"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Ստեղծվում է անձնական պատճենը..."</string>
<string name="yesterday" msgid="6840858548955018569">"Երեկ"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Անվերնագիր միջոցառում)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Սահմանել"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"Կազմակերպություն"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Մականուն"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"Գրառում"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"Վեբկայք"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"Միջոցառում"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"Հարաբերություն"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"Երթուղիներ"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"Վերջին SMS-ը. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>: Սեղմեք՝ պատասխանելու համար"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"մուտքային"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ելքային"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"բաց թողնված"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"Վերջին զանգը. <xliff:g id="CALL_DETAILS">%s</xliff:g>: Սեղմեք՝ հետ զանգելու համար"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"Դուք՝ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 69d44df..9a9c3ec 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontak"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontak"</string>
+ <string name="people" msgid="1190841469952343354">"Kontak"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontak"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontak"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Panggilan langsung"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pilih nomor untuk dipanggil"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pilih nomor untuk dikirimi pesan"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pilih kontak"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Buat kontak baru"</string>
<string name="starredList" msgid="4817256136413959463">"Yang berbintang"</string>
<string name="frequentList" msgid="7154768136473953056">"Sering"</string>
<string name="strequentList" msgid="5640192862059373511">"Favorit"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Lihat kontak"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Tambahkan ke favorit"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Hapus dari favorit"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Dibuang dari favorit"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Ditambahkan ke favorit"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Hapus"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Letakkan di layar Utama"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nama kontak Anda"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tidak ada apl yang ditemukan untuk menangani tindakan ini."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik untuk kembali ke layar sebelumnya"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Tambahkan nomor telepon"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Tambahkan email"</string>
<string name="missing_app" msgid="1466111003546611387">"Tidak ditemukan aplikasi untuk menangani tindakan ini."</string>
<string name="menu_share" msgid="943789700636542260">"Bagikan"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Tambahkan ke kontak"</string>
<string name="share_via" msgid="563121028023030093">"Bagikan kontak melalui"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Buat grup dalam akun"</string>
<string name="audio_chat" msgid="2535716629358298691">"Obrolan suara"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Gunakan foto ini"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Tidak dapat diedit dari apl ini."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Tidak ada informasi tambahan untuk kontak ini."</string>
<string name="group_read_only" msgid="1061762906115697637">"Tidak dapat diedit pada perangkat ini."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Urutkan daftar menurut"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nama depan"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nama keluarga"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Lihat nama kontak"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama depan pertama"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga pertama"</string>
<string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ambil foto baru"</string>
<string name="pick_photo" msgid="2129509985223564942">"Pilih foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Tambahkan akun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tambahkan akun baru"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Ekspor file basis data"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Gambar. Pilih untuk mengubah"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"menambah kontak baru"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Lihat lebih banyak"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Lihat lebih sedikit"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Lihat semua"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontak"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Terbaru"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Tentang"</string>
<string name="send_message" msgid="8938418965550543196">"Kirim pesan"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Membuat salinan pribadi..."</string>
<string name="yesterday" msgid="6840858548955018569">"Kemarin"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 19c202a..a4b2d8d 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Tengiliðir"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Tengiliðir"</string>
+ <string name="people" msgid="1190841469952343354">"Tengiliðir"</string>
<string name="contactsList" msgid="8661624236494819731">"Tengiliðir"</string>
<string name="shortcutContact" msgid="749243779392912958">"Tengiliður"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Bein lína"</string>
@@ -25,8 +24,7 @@
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Veldu tengilið fyrir flýtileið"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Veldu númer til að hringja í"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Veldu númer til að senda skilaboð til"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Velja tengilið"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Búa til nýjan tengilið"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Veldu tengilið"</string>
<string name="starredList" msgid="4817256136413959463">"Stjörnumerktir"</string>
<string name="frequentList" msgid="7154768136473953056">"Mikil samskipti"</string>
<string name="strequentList" msgid="5640192862059373511">"Uppáhald"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Skoða tengilið"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Bæta við uppáhald"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Fjarlægja úr uppáhaldi"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Fjarlægt úr uppáhaldi"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Bætt við uppáhald"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Breyta"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eyða"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Setja á heimaskjáinn"</string>
@@ -80,7 +76,7 @@
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Engar myndir eru tiltækar í spjaldtölvunni."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Engar myndir eru tiltækar í símanum."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Mynd tengiliðar"</string>
- <string name="customLabelPickerTitle" msgid="1081475101983255212">"Sérsniðin merking"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Sérsniðið flokksheiti"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Senda símtöl beint í talhólfið"</string>
<string name="removePhoto" msgid="4898105274130284565">"Fjarlægja mynd"</string>
<string name="noContacts" msgid="8579310973261953559">"Engir tengiliðir."</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"Einn fannst"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> fundust"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Allir"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Allir tengil."</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Uppáhald"</string>
<string name="callBack" msgid="5498224409038809224">"Hringja til baka"</string>
<string name="callAgain" msgid="3197312117049874778">"Hringja aftur"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nöfn tengiliðanna þinna"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ekkert forrit fannst sem getur framkvæmt þessa aðgerð."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Smelltu til að fara aftur á fyrri skjá"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Bæta við símanúmeri"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Bæta við netfangi"</string>
<string name="missing_app" msgid="1466111003546611387">"Ekkert forrit fannst sem getur framkvæmt þessa aðgerð."</string>
<string name="menu_share" msgid="943789700636542260">"Deila"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Bæta við tengiliði"</string>
<string name="share_via" msgid="563121028023030093">"Deila tengilið í gegnum"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Búa til hóp undir reikningi"</string>
<string name="audio_chat" msgid="2535716629358298691">"Símtalsspjall"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Nota þessa mynd"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ekki hægt að breyta úr þessu forriti."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Engar viðbótarupplýsingar um þennan tengilið."</string>
<string name="group_read_only" msgid="1061762906115697637">"Ekki hægt að breyta í þessu tæki."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Raða lista eftir"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Fornafni"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Eftirnafni"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Skoða nöfn tengiliða"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornafn fyrst"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Eftirnafn fyrst"</string>
<string name="take_photo" msgid="7496128293167402354">"Taka mynd"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Taka nýja mynd"</string>
<string name="pick_photo" msgid="2129509985223564942">"Velja mynd"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Bæta reikningi við"</string>
<string name="add_new_account" msgid="5748627740680940264">"Bæta nýjum reikningi við"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Flytja út gagnagrunnsskrár"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Mynd. Veldu til að breyta"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"bæta nýjum tengilið við"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Sjá meira"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Minnka"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Sjá allt"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Tengiliður"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nýlegt"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Um"</string>
<string name="send_message" msgid="8938418965550543196">"Senda skilaboð"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Býr til afrit til einkanota…"</string>
<string name="yesterday" msgid="6840858548955018569">"Í gær"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 31890ba..ff3432a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contatti"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contatti"</string>
+ <string name="people" msgid="1190841469952343354">"Contatti"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatti"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contatto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Composizione diretta"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Scegli un numero da chiamare"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Scegli un numero a cui inviare il messaggio"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Scegli un contatto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crea nuovo contatto"</string>
<string name="starredList" msgid="4817256136413959463">"Speciali"</string>
<string name="frequentList" msgid="7154768136473953056">"Frequenti"</string>
<string name="strequentList" msgid="5640192862059373511">"Preferiti"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Visualizza contatto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Aggiungi a preferiti"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Rimuovi dai preferiti"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Rimosso dai preferiti"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Aggiunto ai preferiti"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Modifica"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Elimina"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Aggiungi a schermata Home"</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"1 trovato"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> trovati"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Tutti"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Tutti i cont."</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Preferiti"</string>
<string name="callBack" msgid="5498224409038809224">"Richiama"</string>
<string name="callAgain" msgid="3197312117049874778">"Richiama"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"I nomi dei tuoi contatti"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nessuna applicazione trovata per gestire questa azione."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fai clic per tornare alla schermata precedente"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Aggiungi numero di telefono"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Aggiungi email"</string>
<string name="missing_app" msgid="1466111003546611387">"Nessuna applicazione trovata per gestire questa azione."</string>
<string name="menu_share" msgid="943789700636542260">"Condividi"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Aggiungi a contatti"</string>
<string name="share_via" msgid="563121028023030093">"Condividi contatto tramite"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Crea un gruppo nell\'account"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat vocale"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizza questa foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Non modificabile da questa applicazione."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nessuna informazione aggiuntiva per questo contatto."</string>
<string name="group_read_only" msgid="1061762906115697637">"Non modificabile su questo dispositivo."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordina elenco per"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Cognome"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Visualizza nomi contatti"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Prima il nome"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Prima il cognome"</string>
<string name="take_photo" msgid="7496128293167402354">"Scatta foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Scatta nuova foto"</string>
<string name="pick_photo" msgid="2129509985223564942">"Scegli foto"</string>
@@ -168,7 +168,7 @@
<string name="menu_copyContact" msgid="1573960845106822639">"Copia nei miei contatti"</string>
<string name="add_to_my_contacts" msgid="1068274916793627723">"Aggiungi ai contatti personali"</string>
<string name="contact_directory_description" msgid="683398073603909119">"Directory <xliff:g id="TYPE">%1$s</xliff:g>"</string>
- <string name="list_filter_custom" msgid="8910173055702057002">"Personalizza"</string>
+ <string name="list_filter_custom" msgid="8910173055702057002">"Personalizzato"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Impostazioni"</string>
<string name="menu_settings" msgid="377929915873428211">"Impostazioni"</string>
<string name="menu_help" msgid="5123887102216637725">"Guida"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Aggiungi account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Aggiungi nuovo account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Esporta file database"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Immagine. Seleziona per modificare"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"aggiungi nuovo contatto"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Mostra altro"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Mostra meno"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Mostra tutto"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contatto"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recenti"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Informazioni"</string>
<string name="send_message" msgid="8938418965550543196">"Invia messaggio"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Creazione di una copia personale..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ieri"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2356765..7a4bbbf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"אנשי קשר"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"אנשי קשר"</string>
+ <string name="people" msgid="1190841469952343354">"אנשי קשר"</string>
<string name="contactsList" msgid="8661624236494819731">"אנשי קשר"</string>
<string name="shortcutContact" msgid="749243779392912958">"איש קשר"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"חיוג ישיר"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"בחר מספר להתקשר אליו"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"בחר מספר לשליחת הודעה"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"בחר איש קשר"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"צור איש קשר חדש"</string>
<string name="starredList" msgid="4817256136413959463">"מסומן בכוכב"</string>
<string name="frequentList" msgid="7154768136473953056">"לעתים קרובות"</string>
<string name="strequentList" msgid="5640192862059373511">"מועדפים"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"הצג איש קשר"</string>
<string name="menu_addStar" msgid="2908478235715404876">"הוסף למועדפים"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"הסר מהמועדפים"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"הוסר מהמועדפים"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"נוסף למועדפים"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ערוך"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"מחק"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"הצב במסך הבית"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"השמות של אנשי הקשר"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"לחץ כדי לחזור אל המסך הקודם"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"הוסף מספר טלפון"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"הוסף אימייל"</string>
<string name="missing_app" msgid="1466111003546611387">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
<string name="menu_share" msgid="943789700636542260">"שתף"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"הוסף לאנשי הקשר"</string>
<string name="share_via" msgid="563121028023030093">"שתף איש קשר באמצעות"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"צור קבוצה עבור חשבון"</string>
<string name="audio_chat" msgid="2535716629358298691">"צ\'אט קולי"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"השתמש בתמונה זו"</string>
<string name="contact_read_only" msgid="7421346527289472273">"לא ניתן לעריכה מאפליקציה זו."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"אין מידע נוסף על איש קשר זה."</string>
<string name="group_read_only" msgid="1061762906115697637">"לא ניתן לעריכה במכשיר זה"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"מיין רשימה לפי"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"שם פרטי"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"שם משפחה"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"הצגת שמות אנשי קשר"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"תחילה שם פרטי"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"שם משפחה תחילה"</string>
<string name="take_photo" msgid="7496128293167402354">"צלם תמונה"</string>
<string name="take_new_photo" msgid="7341354729436576304">"צלם תמונה חדשה"</string>
<string name="pick_photo" msgid="2129509985223564942">"בחר תמונה"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"הוסף חשבון"</string>
<string name="add_new_account" msgid="5748627740680940264">"הוסף חשבון חדש"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ייצוא קובצי מסד נתונים"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"תמונה. בחר כדי לשנות"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"הוסף איש קשר חדש"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"הצג יותר"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"הצג פחות"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"הצג הכל"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"איש קשר"</string>
<string name="recent_card_title" msgid="8982782042698001695">"מהזמן האחרון"</string>
- <string name="about_card_title" msgid="2920942314212825637">"מידע כללי"</string>
<string name="send_message" msgid="8938418965550543196">"שלח הודעה"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"יוצר עותק אישי..."</string>
<string name="yesterday" msgid="6840858548955018569">"אתמול"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fb1f83f..dc3ddff 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"連絡先"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"連絡先"</string>
+ <string name="people" msgid="1190841469952343354">"連絡先"</string>
<string name="contactsList" msgid="8661624236494819731">"連絡先"</string>
<string name="shortcutContact" msgid="749243779392912958">"連絡先"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"直接発信"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"発信する番号の選択"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"メッセージを送る番号の選択"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"連絡先を選択"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"新しい連絡先を作成"</string>
<string name="starredList" msgid="4817256136413959463">"スター付き"</string>
<string name="frequentList" msgid="7154768136473953056">"よく使う連絡先"</string>
<string name="strequentList" msgid="5640192862059373511">"お気に入り"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"連絡先詳細"</string>
<string name="menu_addStar" msgid="2908478235715404876">"お気に入りに追加"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"お気に入りから削除"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"お気に入りから削除します"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"お気に入りに追加します"</string>
<string name="menu_editContact" msgid="9042415603857662633">"編集"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"削除"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ホーム画面に配置"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"連絡先の名前"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"この操作を行うアプリが見つかりませんでした。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"前の画面に戻るにはタップしてください"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"電話番号を追加"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"メールを追加"</string>
<string name="missing_app" msgid="1466111003546611387">"この操作を行うアプリが見つかりませんでした。"</string>
<string name="menu_share" msgid="943789700636542260">"共有"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"連絡先に追加"</string>
<string name="share_via" msgid="563121028023030093">"連絡先の共有ツール"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"次のアカウントにグループを作成"</string>
<string name="audio_chat" msgid="2535716629358298691">"ボイスチャット"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"この写真を使用"</string>
<string name="contact_read_only" msgid="7421346527289472273">"このアプリからは編集できません。"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"この連絡先の詳細情報はありません。"</string>
<string name="group_read_only" msgid="1061762906115697637">"この端末では編集できません。"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"並び替え順"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"連絡先名を表示"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名が先"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓が先"</string>
<string name="take_photo" msgid="7496128293167402354">"写真を撮影"</string>
<string name="take_new_photo" msgid="7341354729436576304">"新しい写真を撮る"</string>
<string name="pick_photo" msgid="2129509985223564942">"写真を選択"</string>
@@ -152,7 +152,7 @@
<string name="menu_display_all" msgid="8887488642609786198">"すべて表示"</string>
<string name="menu_select_all" msgid="621719255150713545">"すべて選択"</string>
<string name="menu_select_none" msgid="7093222469852132345">"選択をすべて解除"</string>
- <string name="add_field" msgid="2384260056674995230">"別の項目を追加"</string>
+ <string name="add_field" msgid="2384260056674995230">"別のフィールドを追加"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"新しく追加"</string>
<string name="add_organization" msgid="7311893231158291197">"所属を追加"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日付"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"アカウントを追加"</string>
<string name="add_new_account" msgid="5748627740680940264">"新しいアカウントを追加"</string>
<string name="menu_export_database" msgid="2659719297530170820">"データベースファイルをエクスポート"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"画像: 選択して変更"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"新しい連絡先を追加"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"もっと見る"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"一部を表示"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"すべて表示"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"連絡先"</string>
<string name="recent_card_title" msgid="8982782042698001695">"最近"</string>
- <string name="about_card_title" msgid="2920942314212825637">"概要"</string>
<string name="send_message" msgid="8938418965550543196">"メッセージの送信"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"個人用コピーを作成しています..."</string>
<string name="yesterday" msgid="6840858548955018569">"昨日"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 80676a9..b2bc2d6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"კონტაქტები"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"კონტაქტები"</string>
+ <string name="people" msgid="1190841469952343354">"კონტაქტები"</string>
<string name="contactsList" msgid="8661624236494819731">"კონტაქტები"</string>
<string name="shortcutContact" msgid="749243779392912958">"კონტაქტი"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"სწრაფი დარეკვა"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"დასარეკად აირჩიეთ ნომერი"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ნომრის შერჩევა შეტყობინების გასაგზავნად"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"კონტაქტის არჩევა"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ახალი კონტაქტის შექმნა"</string>
<string name="starredList" msgid="4817256136413959463">"ვარსკვლავიანი"</string>
<string name="frequentList" msgid="7154768136473953056">"ხშირი"</string>
<string name="strequentList" msgid="5640192862059373511">"რჩეულები"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"კონტაქტის ნახვა"</string>
<string name="menu_addStar" msgid="2908478235715404876">"რჩეულებში დამატება"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"რჩეულებიდან ამოშლა"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"წაიშალა რჩეულებიდან"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"რჩეულებში დამატება"</string>
<string name="menu_editContact" msgid="9042415603857662633">"რედაქტირება"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"წაშლა"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"მთავარ ეკრანზე განთავსება"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"თქვენი კონტაქტების სახელები"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ამ მოქმედების შესასრულებლად აპი ვერ მოიძებნა."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"დააწკაპუნეთ წინა ეკრანზე დასაბრუნებლად"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ტელეფონის ნომრის დამატება"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ელფოსტის დამატება"</string>
<string name="missing_app" msgid="1466111003546611387">"ამ მოქმედების შესასრულებლად აპი ვერ მოიძებნა."</string>
<string name="menu_share" msgid="943789700636542260">"გაზიარება"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"კონტაქტებში დამატება"</string>
<string name="share_via" msgid="563121028023030093">"კონტაქტის გაზიარება"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ჯგუფის შექმნა ანგარიშში"</string>
<string name="audio_chat" msgid="2535716629358298691">"ხმოვანი ჩეთი"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ამ ფოტოს გამოყენება"</string>
<string name="contact_read_only" msgid="7421346527289472273">"არ რედაქტირდება ამ აპიდან"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ამ კონტაქტისთვის დამატებითი ინფორმაცია არ არის."</string>
<string name="group_read_only" msgid="1061762906115697637">"არ რედაქტირდება ამ მოწყობილობაზე."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"სიის სორტირება"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"სახელი"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"გვარი"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"კონტაქტების სახელების ნახვა"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ჯერ სახელი"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ჯერ გვარი"</string>
<string name="take_photo" msgid="7496128293167402354">"ფოტოს გადაღება"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ახალი ფოტოს გადაღება"</string>
<string name="pick_photo" msgid="2129509985223564942">"ფოტოს არჩევა"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"ანგარიშის დამატება"</string>
<string name="add_new_account" msgid="5748627740680940264">"ახალი ანგარიშის დამატება"</string>
<string name="menu_export_database" msgid="2659719297530170820">"მონაცემთა ბაზის ფაილების ექსპორტი"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"სურათი. მონიშნეთ შესაცვლელად"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ახალი კონტაქტის დამატება"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"იხილე მეტი"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"ნაკლების ჩვენება"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"ყველას ჩვენება"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"კონტაქტი"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ბოლო"</string>
- <string name="about_card_title" msgid="2920942314212825637">"შესახებ"</string>
<string name="send_message" msgid="8938418965550543196">"შეტყობინების გაგზავნა"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"იქმნება პერსონალური ასლი..."</string>
<string name="yesterday" msgid="6840858548955018569">"გუშინ"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 6d04942..0fd47b4 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контактілер"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контактілер"</string>
+ <string name="people" msgid="1190841469952343354">"Контактілер"</string>
<string name="contactsList" msgid="8661624236494819731">"Контактілер"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Тікелей теру"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Қоңырау шалатын нөмірді таңдау"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Хабар жіберетін нөмірді таңдау"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Контакт таңдау"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Жаңа контакт жасау"</string>
<string name="starredList" msgid="4817256136413959463">"Жұлдызшалы"</string>
<string name="frequentList" msgid="7154768136473953056">"Жиі"</string>
<string name="strequentList" msgid="5640192862059373511">"Сүйіктілер"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Контактіні көру"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Сүйіктілерге қосу"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Сүйіктілерден алу"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Таңдаулылардан жойылды"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Таңдаулыларға қосылды"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Жөндеу"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Жою"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Негізгі экранға орналастыру"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Контактілеріңіздің аттары"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Бұл әрекетті орындайтын ешқандай қолданба табылмады."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Алдыңғы экранға оралу үшін түртіңіз"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Телефон нөмірін қосу"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Электрондық пошта қосу"</string>
<string name="missing_app" msgid="1466111003546611387">"Бұл әрекетті орындайтын қолданба табылмады."</string>
<string name="menu_share" msgid="943789700636542260">"Бөлісу"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Контактілерге қосу"</string>
<string name="share_via" msgid="563121028023030093">"Контактімен бөлісу"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Есептік жазба арқылы топ құру"</string>
<string name="audio_chat" msgid="2535716629358298691">"Дауыс чаты"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Осы фотосуретті қолдану"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Бұл қолданба арқылы жөнделмейді."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Бұл контакт үшін қосымша ақпарат болмады."</string>
<string name="group_read_only" msgid="1061762906115697637">"Бұл құрылғыда жөндеу мүмкін емеc."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Тізімді келесі белгі бойынша сұрыптау"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Есімі"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Тегі"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Контакт аттарын көру"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Алдымен есімі"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Алдымен тегі"</string>
<string name="take_photo" msgid="7496128293167402354">"Фотосурет түсіру"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Жаңа фотосурет түсіру"</string>
<string name="pick_photo" msgid="2129509985223564942">"Фотосуретті таңдау"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Есептік жазба қосу"</string>
<string name="add_new_account" msgid="5748627740680940264">"Жаңа есептік жазба қосу"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Дерекқор файлдарын экспорттау"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Сурет. Өзгерту үшін таңдау"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"жаңа контакт қосу"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Көбірек көру"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Азырақ көру"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Барлығын көру"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Жақындағы"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Туралы"</string>
<string name="send_message" msgid="8938418965550543196">"Хабарды жіберу"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Жеке көшірмені жасау…"</string>
<string name="yesterday" msgid="6840858548955018569">"Кеше"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index cf9e91c..ed39aaf 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"ទំនាក់ទំនង"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"ទំនាក់ទំនង"</string>
+ <string name="people" msgid="1190841469952343354">"ទំនាក់ទំនង"</string>
<string name="contactsList" msgid="8661624236494819731">"ទំនាក់ទំនង"</string>
<string name="shortcutContact" msgid="749243779392912958">"ទំនាក់ទំនង"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ហៅដោយផ្ទាល់"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ជ្រើសលេខដើម្បីហៅ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ជ្រើសលេខដើម្បីផ្ញើសារ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ជ្រើសទំនាក់ទំនង"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"បង្កើតទំនាក់ទំនងថ្មី"</string>
<string name="starredList" msgid="4817256136413959463">"បានដាក់ផ្កាយ"</string>
<string name="frequentList" msgid="7154768136473953056">"ញឹកញាប់"</string>
<string name="strequentList" msgid="5640192862059373511">"សំណព្វ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"មើលទំនាក់ទំនង"</string>
<string name="menu_addStar" msgid="2908478235715404876">"បន្ថែមទៅសំណព្វ"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"លុបចេញពីសំណព្វ"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"បានលុបចេញនិយមប្រើ"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"បន្ថែមទៅនិយមប្រើ"</string>
<string name="menu_editContact" msgid="9042415603857662633">"កែសម្រួល"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"លុប"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ដាក់លើអេក្រង់ដើម"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"ឈ្មោះនៃទំនាក់ទំនងរបស់អ្នក"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"រកមិនឃើញកម្មវិធីសម្រាប់សកម្មភាពនេះទេ។"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ចុច ដើម្បីត្រឡប់ទៅអេក្រង់មុន"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"បន្ថែមលេខទូរស័ព្ទ"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"បន្ថែមអ៊ីមែល"</string>
<string name="missing_app" msgid="1466111003546611387">"រកមិនឃើញកម្មវិធីដើម្បីគ្រប់គ្រងសកម្មភាពនេះទេ។"</string>
<string name="menu_share" msgid="943789700636542260">"ចែករំលែក"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"បន្ថែមទៅទំនាក់ទំនង"</string>
<string name="share_via" msgid="563121028023030093">"ចែករំលែកទំនាក់ទំនងតាម"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"បង្កើតក្រុមនៅក្នុងគណនី"</string>
<string name="audio_chat" msgid="2535716629358298691">"ជជែកជាសំឡេង"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ប្រើរូបថតនេះ"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ពីកម្មវិធីនេះ មិនអាចកែបានទេ។"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"មិនមានព័ត៌មានបន្ថែមសម្រាប់ទំនាក់ទំនងនេះទេ។"</string>
<string name="group_read_only" msgid="1061762906115697637">"មិនអាចកែបានទេលើឧបករណ៍នេះ។"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"តម្រៀបបញ្ជីតាម"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"នាមខ្លួន"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"នាមត្រកូល"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"មើលឈ្មោះទំនាក់ទំនង"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"នាមខ្លួនមុន"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"នាមត្រកូលមុន"</string>
<string name="take_photo" msgid="7496128293167402354">"ថតរូប"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ថតរូបថ្មី"</string>
<string name="pick_photo" msgid="2129509985223564942">"ជ្រើសរូបថត"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"បន្ថែមគណនី"</string>
<string name="add_new_account" msgid="5748627740680940264">"បន្ថែមគណនីថ្មី"</string>
<string name="menu_export_database" msgid="2659719297530170820">"នាំចេញឯកសារមូលដ្ឋានទិន្នន័យ"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"រូបភាព។ ជ្រើសដើម្បីប្ដូរ"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"បន្ថែមទំនាក់ទំនងថ្មី"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"មើលច្រើនជាង"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"មើលតិចជាង"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"មើលទាំងអស់"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"ទំនាក់ទំនង"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ថ្មីៗ"</string>
- <string name="about_card_title" msgid="2920942314212825637">"អំពី"</string>
<string name="send_message" msgid="8938418965550543196">"ផ្ញើសារ"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"កំពុងបង្កើតច្បាប់ចម្លងផ្ទាល់ខ្លួន..."</string>
<string name="yesterday" msgid="6840858548955018569">"ម្សិលមិញ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f32e45e..0c1d701 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"ಸಂಪರ್ಕಗಳು"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"ಸಂಪರ್ಕಗಳು"</string>
+ <string name="people" msgid="1190841469952343354">"ಸಂಪರ್ಕಗಳು"</string>
<string name="contactsList" msgid="8661624236494819731">"ಸಂಪರ್ಕಗಳು"</string>
<string name="shortcutContact" msgid="749243779392912958">"ಸಂಪರ್ಕ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ನೇರ ಡಯಲ್"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ಕೆರಮಾಡಲು ಸಂಖ್ಯೆಯೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ಸಂದೇಶಕ್ಕಾಗಿ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ಸಂಪರ್ಕ ಆಯ್ಕೆ ಮಾಡಿ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ"</string>
<string name="starredList" msgid="4817256136413959463">"ನಕ್ಷತ್ರ ಹಾಕಿರುವುದು"</string>
<string name="frequentList" msgid="7154768136473953056">"ಆಗಾಗ್ಗೆ"</string>
<string name="strequentList" msgid="5640192862059373511">"ಮೆಚ್ಚಿನವುಗಳು"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="menu_addStar" msgid="2908478235715404876">"ಮೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರಿಸಿ"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"ಮೆಚ್ಚಿನವುಗಳಿಂದ ತೆಗೆದುಹಾಕಿ"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"ಮೆಚ್ಚಿನವುಗಳಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"ಮೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರಿಸಲಾಗಿದೆ"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ಸಂಪಾದಿಸು"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ಅಳಿಸು"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ಮುಖಪುಟ ಪರದೆಯ ಮೇಲೆ ಇರಿಸು"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಹೆಸರುಗಳು"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ಈ ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ಹಿಂದಿನ ಪರದೆಗೆ ಹಿಂತಿರುಗಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಸೇರಿಸಿ"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ಇಮೇಲ್ ಸೇರಿಸಿ"</string>
<string name="missing_app" msgid="1466111003546611387">"ಈ ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string>
<string name="menu_share" msgid="943789700636542260">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸು"</string>
<string name="share_via" msgid="563121028023030093">"ಸಂಪರ್ಕದ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ಗುಂಪನ್ನು ರಚಿಸಿ"</string>
<string name="audio_chat" msgid="2535716629358298691">"ಧ್ವನಿ ಚಾಟ್"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ಈ ಫೋಟೋವನ್ನು ಬಳಸಿ"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ಈ ಅಪ್ಲಿಕೇಶನ್ನಿಂದ ಸಂಪಾದಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಯಾವುದೇ ಹೆಚ್ಚುವರಿ ಮಾಹಿತಿ ಇಲ್ಲ."</string>
<string name="group_read_only" msgid="1061762906115697637">"ಈ ಸಾಧನದಲ್ಲಿ ಸಂಪಾದಿಸಲು ಆಗುವುದಿಲ್ಲ."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"ಪಟ್ಟಿಯನ್ನು ಹೀಗೆ ವಿಂಗಡಿಸಿ"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ನೀಡಿದ ಹೆಸರು"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"ಕುಟುಂಬದ ಹೆಸರು"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"ಸಂಪರ್ಕ ಹೆಸರುಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ಮೊದಲಿಗೆ ಹೆಸರು ನೀಡಲಾಗಿದೆ"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ಮೊದಲಿಗೆ ಕುಟುಂಬದ ಹೆಸರು"</string>
<string name="take_photo" msgid="7496128293167402354">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ಹೊಸ ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
<string name="pick_photo" msgid="2129509985223564942">"ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -154,7 +154,7 @@
<string name="menu_select_none" msgid="7093222469852132345">"ಎಲ್ಲವನ್ನು ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ"</string>
<string name="add_field" msgid="2384260056674995230">"ಮತ್ತೊಂದು ಕ್ಷೇತ್ರವನ್ನು ಸೇರಿಸಿ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"ಹೊಸದನ್ನು ಸೇರಿಸಿ"</string>
- <string name="add_organization" msgid="7311893231158291197">"ಸಂಸ್ಥೆಯನ್ನು ಸೇರಿಸಿ"</string>
+ <string name="add_organization" msgid="7311893231158291197">"ಸಂಘಟನೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ದಿನಾಂಕ"</string>
<string name="group_edit_field_hint_text" msgid="3966441850870457808">"ಗುಂಪು ಹೆಸರು"</string>
<string name="description_star" msgid="2605854427360036550">"ಮೆಚ್ಚಿನ"</string>
@@ -182,7 +182,7 @@
<string name="date_year_toggle" msgid="7356532842767854606">"ವರ್ಷವನ್ನು ಒದಗಿಸಿ"</string>
<string name="social_widget_label" msgid="6378905543028924592">"ಸಂಪರ್ಕ"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
- <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ"</string>
+ <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"ಹೊಸದೊಂದು ಸಂಪರ್ಕವನ್ನು ರಚಿಸು"</string>
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"ಹೊಸ ಗುಂಪು ರಚಿಸಿ"</string>
@@ -215,7 +215,7 @@
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲಾಗುತ್ತಿದೆ"</string>
<string name="no_account_prompt" msgid="6424883302325061025">"Google ಖಾತೆಯಲ್ಲಿ ಸಂಪರ್ಕಗಳ ಕಾರ್ಯ ಉತ್ತಮವಾಗಿರುತ್ತದೆ.\n\n• ಯಾವುದೇ ವೆಬ್ ಬ್ರೌಸರ್ನಿಂದ ಪ್ರವೇಶಿಸಿ.\n• ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಬ್ಯಾಕ್ ಅಪ್ ಮಾಡಿ."</string>
<string name="generic_no_account_prompt" msgid="7218827704367325460">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಕಳೆದುಕೊಂಡರೂ ಸಹ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಇರಿಸಿಕೊಳ್ಳಿ: ಆನ್ಲೈನ್ ಸೇವೆಯೊಂದಿಗೆ ಸಿಂಕ್ರೊನೈಸ್ ಮಾಡಿ."</string>
- <string name="generic_no_account_prompt_title" msgid="753783911899054860">"ಖಾತೆಯೊಂದನ್ನು ಸೇರಿಸು"</string>
+ <string name="generic_no_account_prompt_title" msgid="753783911899054860">"ಖಾತೆಯೊಂದನ್ನು ಸೇರಿಸಿ"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"ನಿಮ್ಮ ಹೊಸ ಸಂಪರ್ಕವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡುವುದಿಲ್ಲ. ಸಂಪರ್ಕಗಳನ್ನು ಆನ್ಲೈನ್ನಲ್ಲಿ ಬ್ಯಾಕಪ್ ಇರಿಸುವ ಖಾತೆಯನ್ನು ಸೇರಿಸುವುದೇ?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"<xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ನಿಮ್ಮ ಹೊಸ ಸಂಪರ್ಕವನ್ನು ಸಿಂಕ್ರೊನೈಜ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"ಕೆಳಗಿನ ಖಾತೆಗಳೊಂದಿಗೆ ನಿಮ್ಮ ಹೊಸ ಸಂಪರ್ಕವನ್ನು ನೀವು ಸಿಂಕ್ರೊನೈಸ್ ಮಾಡಬಹುದು. ಯಾವುದನ್ನು ಬಳಸಲು ನೀವು ಬಯಸುತ್ತೀರಿ?"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="add_new_account" msgid="5748627740680940264">"ಹೊಸ ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ಡೇಟಾಬೇಸ್ ಫೈಲ್ಗಳನ್ನು ರಫ್ತು ಮಾಡಿ"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ಚಿತ್ರ. ಬದಲಾಯಿಸಲು ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ಹೊಸ ಸಂಪರ್ಕವನ್ನು ಸೇರಿಸು"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"ಕಡಿಮೆ ನೋಡಿ"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"ಸಂಪರ್ಕಿಸಿ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ಇತ್ತೀಚಿನದು"</string>
- <string name="about_card_title" msgid="2920942314212825637">"ಕುರಿತು"</string>
<string name="send_message" msgid="8938418965550543196">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"ವೈಯಕ್ತಿಕ ಪ್ರತಿಯನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ..."</string>
<string name="yesterday" msgid="6840858548955018569">"ನಿನ್ನೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index be5a949..2ffdb3c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"주소록"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"주소록"</string>
+ <string name="people" msgid="1190841469952343354">"주소록"</string>
<string name="contactsList" msgid="8661624236494819731">"주소록"</string>
<string name="shortcutContact" msgid="749243779392912958">"연락처"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"바로 전화 걸기"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"전화번호 선택"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"메시지를 보낼 번호 선택"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"연락처 선택"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"새 연락처 만들기"</string>
<string name="starredList" msgid="4817256136413959463">"중요주소록"</string>
<string name="frequentList" msgid="7154768136473953056">"자주 사용하는 연락처"</string>
<string name="strequentList" msgid="5640192862059373511">"즐겨찾기"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"연락처 보기"</string>
<string name="menu_addStar" msgid="2908478235715404876">"즐겨찾기에 추가"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"즐겨찾기에서 삭제"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"즐겨찾기에서 삭제됨"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"즐겨찾기에 추가됨"</string>
<string name="menu_editContact" msgid="9042415603857662633">"수정"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"삭제"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"홈 화면에 만들기"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"연락처 명단"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"이 작업을 처리하는 앱을 찾을 수 없습니다."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"이전 화면으로 돌아가려면 클릭"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"전화번호 추가"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"이메일 추가"</string>
<string name="missing_app" msgid="1466111003546611387">"이 작업을 처리하는 앱을 찾을 수 없습니다."</string>
<string name="menu_share" msgid="943789700636542260">"공유"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"주소록에 추가"</string>
<string name="share_via" msgid="563121028023030093">"연락처 공유에 사용할 애플리케이션:"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"계정에서 그룹 만들기"</string>
<string name="audio_chat" msgid="2535716629358298691">"음성채팅"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"사진 사용"</string>
<string name="contact_read_only" msgid="7421346527289472273">"이 앱에서 수정할 수 없습니다."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"연락처에 대한 추가 정보가 없습니다."</string>
<string name="group_read_only" msgid="1061762906115697637">"이 기기에서 수정할 수 없습니다."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"목록 정렬 기준"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"이름"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"성"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"연락처 이름 보기"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"이름 먼저 표시"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"성 먼저 표시"</string>
<string name="take_photo" msgid="7496128293167402354">"사진 찍기"</string>
<string name="take_new_photo" msgid="7341354729436576304">"새 사진 찍기"</string>
<string name="pick_photo" msgid="2129509985223564942">"사진 선택"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"계정 추가"</string>
<string name="add_new_account" msgid="5748627740680940264">"새 계정 추가"</string>
<string name="menu_export_database" msgid="2659719297530170820">"데이터베이스 파일 내보내기"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"사진을 변경하려면 선택"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"새 연락처 추가"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"더보기"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"간략히 보기"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"모두 보기"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"연락처"</string>
<string name="recent_card_title" msgid="8982782042698001695">"최근"</string>
- <string name="about_card_title" msgid="2920942314212825637">"정보"</string>
<string name="send_message" msgid="8938418965550543196">"메시지 보내기"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"개인 사본 작성 중..."</string>
<string name="yesterday" msgid="6840858548955018569">"어제"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 722384f..626af73 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Байланыштар"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Байланыштар"</string>
+ <string name="people" msgid="1190841469952343354">"Байланыштар"</string>
<!-- no translation found for contactsList (8661624236494819731) -->
<skip />
<!-- no translation found for shortcutContact (749243779392912958) -->
@@ -33,7 +32,6 @@
<!-- no translation found for messageShortcutActivityTitle (3084542316620335911) -->
<skip />
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Байланыш тандоо"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Жаңы байланыш түзүү"</string>
<!-- no translation found for starredList (4817256136413959463) -->
<skip />
<!-- no translation found for frequentList (7154768136473953056) -->
@@ -62,8 +60,6 @@
<skip />
<!-- no translation found for menu_removeStar (5844227078364227030) -->
<skip />
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Сүйүктүүлөрдөн чыгарылды"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Сүйүктүүлөргө кошулду"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Өзгөртүү"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Жок кылуу"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Үй экранына жайгаштыруу"</string>
@@ -165,12 +161,9 @@
<skip />
<string name="quickcontact_missing_app" msgid="358168575340921552">"Бул ишти аткаруучу эч бир колдонмо табылган жок."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Мурунку экранга кайтуу үчүн чыкылдатыңыз"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Телефон номерин кошуу"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Электрондук почта дарегин кошуу"</string>
<string name="missing_app" msgid="1466111003546611387">"Бул ишти аткаруучу эч бир колдонмо табылган жок."</string>
<!-- no translation found for menu_share (943789700636542260) -->
<skip />
- <string name="menu_add_contact" msgid="3198704337220892684">"Байланыштарга кошуу"</string>
<!-- no translation found for share_via (563121028023030093) -->
<skip />
<!-- no translation found for dialog_new_group_account (2318032089273496830) -->
@@ -188,7 +181,19 @@
<!-- no translation found for use_photo_as_primary (8807110122951157246) -->
<skip />
<string name="contact_read_only" msgid="7421346527289472273">"Бул колдонмодон өзгөртүлбөйт."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Бул байланыштын кошумча маалыматтары жок."</string>
<string name="group_read_only" msgid="1061762906115697637">"Бул түзмөктөн өзгөртүлбөйт."</string>
+ <!-- no translation found for display_options_sort_list_by (6080091755852211076) -->
+ <skip />
+ <!-- no translation found for display_options_sort_by_given_name (184916793466387067) -->
+ <skip />
+ <!-- no translation found for display_options_sort_by_family_name (7857986975275712622) -->
+ <skip />
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Байланыш аттарын кароо"</string>
+ <!-- no translation found for display_options_view_given_name_first (6968288511197363292) -->
+ <skip />
+ <!-- no translation found for display_options_view_family_name_first (1447288164951453714) -->
+ <skip />
<!-- no translation found for take_photo (7496128293167402354) -->
<skip />
<!-- no translation found for take_new_photo (7341354729436576304) -->
@@ -305,12 +310,13 @@
<string name="add_account" msgid="8201790677994503186">"Эсеп кошуу"</string>
<string name="add_new_account" msgid="5748627740680940264">"Жаңы эсеп кошуу"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Берилиштер корлорунун файлдарын экспорттоо"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Сүрөтү. Өзгөртүү үчүн тандоо"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"жаңы байланыш кошуу"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Дагы көрүү"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Азыраак көрүү"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Бардыгын көрүү"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Байланыш"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Акыркы"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Жөнүндө"</string>
<string name="send_message" msgid="8938418965550543196">"Билдирүү жөнөтүү"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Жеке көчүрмөнү алуу..."</string>
<string name="yesterday" msgid="6840858548955018569">"Кечээ"</string>
diff --git a/res/values-land/vals.xml b/res/values-land/vals.xml
deleted file mode 100644
index ebcae31..0000000
--- a/res/values-land/vals.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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>
- <!-- The ratio of width:height for the contact's photo -->
- <item name="quickcontact_photo_ratio" type="vals" format="float">0.7</item>
-</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 19e3161..9a0f943 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
+ <string name="people" msgid="1190841469952343354">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="contactsList" msgid="8661624236494819731">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="shortcutContact" msgid="749243779392912958">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ໂທຫາໂດຍກົງ"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ເລືອກໝາຍເລກເພື່ອໂທ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"ເລືອກເບີເພື່ອສົ່ງຂໍ້ຄວາມ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ເລືອກລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"ສ້າງລາຍຊື່ຜູ່ຕິດຕໍ່ໃໝ່"</string>
<string name="starredList" msgid="4817256136413959463">"ໝາຍດາວແລ້ວ"</string>
<string name="frequentList" msgid="7154768136473953056">"ເລື້ອຍໆ"</string>
<string name="strequentList" msgid="5640192862059373511">"ລາຍການທີ່ມັກ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"ເບິ່ງລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="menu_addStar" msgid="2908478235715404876">"ເພີ່ມເປັນລາຍການທີ່ມັກ"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"ລຶບອອກຈາກລາຍການທີ່ມັກ"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"ລຶບອອກຈາກລາຍການທີ່ມັກແລ້ວ"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"ເພີ່ມໃສ່ລາຍການທີ່ມັກ"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ແກ້ໄຂ"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ລຶບ"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ວາງໃສ່ໜ້າຈໍຫຼັກ"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"ຊື່ຂອງລາຍຊື່ຜູ່ຕິດຕໍ່ຂອງທ່ານ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ບໍ່ພົບແອັບຯທີ່ໃຊ້ເພື່ອດຳເນີນການ."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ຄລິກເພື່ອກັບໄປທີ່ໜ້າຈໍກ່ອນໜ້ານີ້"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ເພີ່ມເບີໂທລະສັບ"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ເພີ່ມອີເມວ"</string>
<string name="missing_app" msgid="1466111003546611387">"ບໍ່ພົບແອັບຯທີ່ໃຊ້ເພື່ອດຳເນີນການ."</string>
<string name="menu_share" msgid="943789700636542260">"ແບ່ງປັນ"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"ເພີ່ມໃນລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="share_via" msgid="563121028023030093">"ແບ່ງປັນລາຍຊື່ຜູ່ຕິດຕໍ່ຜ່ານທາງ"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ສ້າງກຸ່ມພາຍໃຕ້ບັນຊີ"</string>
<string name="audio_chat" msgid="2535716629358298691">"ການສົນທະນາດ້ວຍສຽງ"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ໃຊ້ຮູບນີ້"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ບໍ່ສາມາດແກ້ໄຂໄດ້ຈາກແອັບຯນີ້."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ບໍ່ມີຂໍ້ມູນເພີ່ມເຕີມສຳລັບລາຍຊື່ຜູ່ຕິດຕໍ່ນີ້."</string>
<string name="group_read_only" msgid="1061762906115697637">"ບໍ່ສາມາດແກ້ໄຂໄດ້ໃນອຸປະກອນນີ້."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"ຈັດຮຽງລາຍຊື່ໂດຍ"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ຊື່"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"ນາມສະກຸນ"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"ເບິ່ງຊື່ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ຊື່ມາກ່ອນ"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ນາມສະກຸນກ່ອນ"</string>
<string name="take_photo" msgid="7496128293167402354">"ຖ່າຍຮູບ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ຖ່າຍຮູບໃໝ່"</string>
<string name="pick_photo" msgid="2129509985223564942">"ເລືອກຮູບ"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"ເພີ່ມບັນຊີ"</string>
<string name="add_new_account" msgid="5748627740680940264">"ເພີ່ມບັນຊີໃໝ່"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ສົ່ງອອກໄຟລ໌ຖານຂໍ້ມູນ"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ຮູບພາບ. ເລືອກເພື່ອປ່ຽນ"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ເພີ່ມລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ເບິ່ງເພີ່ມເຕີມ"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"ເບິ່ງໜ້ອຍລົງ"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"ເບິ່ງທັງໝົດ"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"ຕິດຕໍ່"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ບໍ່ດົນມານີ້"</string>
- <string name="about_card_title" msgid="2920942314212825637">"ກ່ຽວກັບ"</string>
<string name="send_message" msgid="8938418965550543196">"ສົ່ງຂໍ້ຄວາມ"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"ກຳລັງສ້າງສຳເນົາສ່ວນບຸກຄົນ..."</string>
<string name="yesterday" msgid="6840858548955018569">"ມື້ວານນີ້"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ນັດໝາຍບໍ່ມີຊື່)"</string>
<string name="date_time_set" msgid="4761419824439606690">"ຕົກລົງ"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"ອົງກອນ"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"ຊື່ຫຼິ້ນ"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"ບັນທຶກ"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"ເວັບໄຊ"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"ການນັດໝາຍ"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"ຄວາມສຳພັນ"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"ເສັ້ນທາງໄປຫາສະຖານທີ່"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"SMS ຫຼ້າສຸດ. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. ຄລິກເພື່ອຕອບ"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ສາຍໂທເຂົ້າ"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ສາຍໂທອອກ"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ບໍ່ໄດ້ຮັບ"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"ໂທຫຼ້າສຸດ. <xliff:g id="CALL_DETAILS">%s</xliff:g>. ຄລິກເພື່ອໂທກັບ"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"ທ່ານ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f49cec7..bbb8be9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktai"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktai"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktai"</string>
<string name="contactsList" msgid="8661624236494819731">"Adresinė"</string>
<string name="shortcutContact" msgid="749243779392912958">"Adresatas"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Tiesioginis numerio rinkimas"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pasirinkite numerį, kuriuo skambinsite"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pasirinkti numerį, kuriuo bus siunčiamas pranešimas"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pasirinkti kontaktą"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Kurti naują kontaktą"</string>
<string name="starredList" msgid="4817256136413959463">"Pažymėta žvaigždute"</string>
<string name="frequentList" msgid="7154768136473953056">"Dažnai naudojami"</string>
<string name="strequentList" msgid="5640192862059373511">"Mėgstamiausi"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Žiūrėti adresatą"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Pridėti prie adresyno"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Pašalinti iš adresyno"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Pašalinta iš mėgstamiausių"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Pridėta prie mėgstamiausių"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redaguoti"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ištrinti"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Padėti pagrindiniame ekrane"</string>
@@ -71,7 +67,7 @@
<string name="menu_discard" msgid="6854657936970228164">"Atmesti pakeitimus"</string>
<string name="invalidContactMessage" msgid="8215051456181842274">"Kontaktas neegzistuoja."</string>
<string name="createContactShortcutSuccessful" msgid="7874133287558150877">"Kontaktų valdiklis pridėtas prie pagrindinio ekrano."</string>
- <string name="pickerNewContactHeader" msgid="7750705279843568147">"Kurti naują kontaktą"</string>
+ <string name="pickerNewContactHeader" msgid="7750705279843568147">"Kurti naują adresatą"</string>
<string name="pickerNewContactText" msgid="6166997164401048211">"Kurti naują kontaktą"</string>
<string-array name="otherLabels">
<item msgid="8287841928119937597">"Organizacija"</item>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktų vardai"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nerasta jokių programų šiam veiksmui apdoroti."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Spustelėkite, kad grįžtumėte į ankstesnį ekraną"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Pridėti telefono numerį"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Pridėti el. pašto adresą"</string>
<string name="missing_app" msgid="1466111003546611387">"Nerasta jokių programų šiam veiksmui apdoroti."</string>
<string name="menu_share" msgid="943789700636542260">"Bendrinti"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Pridėti prie kontaktų"</string>
<string name="share_via" msgid="563121028023030093">"Bendrinti adresatą naudojant"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Kurti grupę paskyroje"</string>
<string name="audio_chat" msgid="2535716629358298691">"Balso pokalbis"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Naudoti šią nuotrauką"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Iš šios programos redaguoti negalima."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nėra papildomos informacijos apie šį kontaktą."</string>
<string name="group_read_only" msgid="1061762906115697637">"Negalima redaguoti šiame įrenginyje."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Rūšiuoti sąrašą pagal"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Suteiktas pavadinimas"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Pavardė"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Žiūrėti kontaktų vardus"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pirmiausia suteiktas pavadinimas"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Pirmiausia pavardė"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotografuoti"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Iš naujo fotografuoti"</string>
<string name="pick_photo" msgid="2129509985223564942">"Pasirinkti nuotrauką"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Pridėkite paskyrą"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pridėkite naują paskyrą"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportuoti duomenų failus"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Nuotrauka. Pasirinkite, kad pakeistumėte"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"pridėti naują kontaktą"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Žr. daugiau"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Žr. mažiau"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Žr. viską"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontaktas"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Naujausios"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Apie"</string>
<string name="send_message" msgid="8938418965550543196">"Siųsti pranešimą"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Kuriama asmeninė kopija..."</string>
<string name="yesterday" msgid="6840858548955018569">"Vakar"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2dad650..aacbc7f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktpersonas"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktpersonas"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktpersonas"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontaktpersonas"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontaktpersona"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Tiešais zvans"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Izvēlieties numuru, uz kuru zvanīt"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Izvēlieties numuru, uz kuru sūtīt īsziņu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontaktpersonas izvēle"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Radiet jaunu kontaktpersonu"</string>
<string name="starredList" msgid="4817256136413959463">"Atzīmēti ar zvaigznīti"</string>
<string name="frequentList" msgid="7154768136473953056">"Bieži"</string>
<string name="strequentList" msgid="5640192862059373511">"Izlase"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Skatīt kontaktpersonu"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Pievienot izlasei"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Noņemt no izlases"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Noņemts no izlases"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Pievienots izlasei"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediģēt"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Dzēst"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Novietot sākuma ekrānā"</string>
@@ -62,7 +58,7 @@
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Ieteiktās kontaktpersonas"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Visas kontaktpersonas"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"Kontaktpersonas ir apvienotas."</string>
- <string name="menu_set_ring_tone" msgid="8728345772068064946">"Iestatīt zv. signālu"</string>
+ <string name="menu_set_ring_tone" msgid="8728345772068064946">"Iest. zv. sign."</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Visi zvani uz balss pastu"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Jūs nevarat dzēst kontaktpersonas no tikai lasāmiem kontiem, taču varat tās slēpt kontaktpersonu sarakstos."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Šī kontaktpersona satur informāciju no vairākiem kontiem. Informācija no tikai lasāmiem kontiem jūsu kontaktpersonu sarakstā tiks slēpta, nevis dzēsta."</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktpersonu vārdi"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Netika atrasta neviena lietotne šīs darbības veikšanai."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Noklikšķiniet, lai atgrieztos iepriekšējā ekrānā."</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Pievienojiet tālruņa numuru"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Pievienojiet e-pasta adresi"</string>
<string name="missing_app" msgid="1466111003546611387">"Netika atrasta neviena lietotne šīs darbības veikšanai."</string>
<string name="menu_share" msgid="943789700636542260">"Kopīgot"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Pievienot kontaktpersonām"</string>
<string name="share_via" msgid="563121028023030093">"Kopīgot kontaktpersonu, izmantojot"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Izveidot grupu šajā kontā:"</string>
<string name="audio_chat" msgid="2535716629358298691">"Balss tērzēšana"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Izmantot šo fotoattēlu"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nevar rediģēt šajā lietotnē."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nav pieejama papildinformācija par šo kontaktpersonu."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nevar rediģēt šajā ierīcē."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Kārtot sarakstu pēc"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Vārds"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Uzvārds"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Skatīt kontaktpersonu vārdus"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vispirms rādīt vārdu"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vispirms rādīt uzvārdu"</string>
<string name="take_photo" msgid="7496128293167402354">"Uzņemt fotoattēlu"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Uzņemt jaunu fotoattēlu"</string>
<string name="pick_photo" msgid="2129509985223564942">"Izvēlēties fotoattēlu"</string>
@@ -154,9 +154,9 @@
<string name="menu_select_none" msgid="7093222469852132345">"Noņemt atlasi visam"</string>
<string name="add_field" msgid="2384260056674995230">"Pievienot vēl vienu lauku"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Pievienot jaunu"</string>
- <string name="add_organization" msgid="7311893231158291197">"Pievienot organizāciju"</string>
+ <string name="add_organization" msgid="7311893231158291197">"Pievienot organiz."</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datums"</string>
- <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grupas nosaukums"</string>
+ <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grupas nos."</string>
<string name="description_star" msgid="2605854427360036550">"izlase"</string>
<string name="edit_contact" msgid="7529281274005689512">"Kontaktpersonu rediģēšana"</string>
<plurals name="merge_info">
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Pievienot kontu"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pievienot jaunu kontu"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportēt datu bāzes failus"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Attēls. Lai mainītu, atlasiet."</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"pievienot jaunu kontaktpersonu"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Skatīt vairāk"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Skatīt mazāk"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Skatīt visu"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontaktpersona"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nesenie"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Par"</string>
<string name="send_message" msgid="8938418965550543196">"Sūtīt ziņojumu"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Notiek personīgās kopijas izveide…"</string>
<string name="yesterday" msgid="6840858548955018569">"Vakar"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0243c4a..cdbbdb0 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контакти"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контакти"</string>
+ <string name="people" msgid="1190841469952343354">"Контакти"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакти"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Директно бирање"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Изберете број да се јавите"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Избери број да испратиш порака"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Одбери контакт"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Создај нов контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Со ѕвезда"</string>
<string name="frequentList" msgid="7154768136473953056">"Често"</string>
<string name="strequentList" msgid="5640192862059373511">"Омилени"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Прикажи контакт"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Додај во омилени"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Отстрани од омилени"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Отстрането од омилени"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Додадено во омилени"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Уреди"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Избриши"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Постави на почетниот екран"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Имиња на вашите контакти"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не е пронајдена апликација да се справи со ова дејство."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликнете за да се вратите на претходниот екран"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Додајте телефонски број"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Додајте е-пошта"</string>
<string name="missing_app" msgid="1466111003546611387">"Не е пронајдена апликација да се справи со ова дејство."</string>
<string name="menu_share" msgid="943789700636542260">"Сподели"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Додај во контакти"</string>
<string name="share_via" msgid="563121028023030093">"Сподели контакт преку"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Создај група под сметка"</string>
<string name="audio_chat" msgid="2535716629358298691">"Гласовен разговор"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Користи ја оваа фотографија"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Не се уредува од оваа апликација."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Нема дополнителни информации за овој контакт."</string>
<string name="group_read_only" msgid="1061762906115697637">"Не може да се уреди на овој уред."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Подреди список по"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Име"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Презиме"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Прикажи имиња на контакти"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Прво име"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Прво презиме"</string>
<string name="take_photo" msgid="7496128293167402354">"Фотографирај"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Направи нова фотографија"</string>
<string name="pick_photo" msgid="2129509985223564942">"Избери фотографија"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Додај сметка"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додај нова сметка"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Извези датотеки од база на податоци"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Слика. Изберете за да промените"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"додај нов контакт"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Погледни повеќе"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Погледни помалку"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Погледни ги сите"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Неодамнешни"</string>
- <string name="about_card_title" msgid="2920942314212825637">"За"</string>
<string name="send_message" msgid="8938418965550543196">"Испрати порака"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Се создава лична копија..."</string>
<string name="yesterday" msgid="6840858548955018569">"Вчера"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 2b21aba..613e294 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -16,17 +16,15 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"വിലാസങ്ങൾ"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"വിലാസങ്ങൾ"</string>
- <string name="contactsList" msgid="8661624236494819731">"വിലാസങ്ങൾ"</string>
+ <string name="people" msgid="1190841469952343354">"കോണ്ടാക്റ്റുകള്"</string>
+ <string name="contactsList" msgid="8661624236494819731">"കോണ്ടാക്റ്റുകള്"</string>
<string name="shortcutContact" msgid="749243779392912958">"കോൺടാക്റ്റ്"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"നേരിട്ടുള്ള ഡയൽ"</string>
- <string name="shortcutMessageContact" msgid="2460337253595976198">"സന്ദേശങ്ങൾ നേരിട്ട്"</string>
+ <string name="shortcutMessageContact" msgid="2460337253595976198">"നേരിട്ടുള്ള സന്ദേശമയയ്ക്കൽ"</string>
<string name="shortcutActivityTitle" msgid="6642877210643565436">"ഒരു കോൺടാക്റ്റ് കുറുക്കുവഴി തിരഞ്ഞെടുക്കുക"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"വിളിക്കാൻ ഒരു നമ്പർ തിരഞ്ഞെടുക്കുക"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"സന്ദേശമയയ്ക്കാൻ ഒരു നമ്പർ തിരഞ്ഞെടുക്കുക"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ഒരു കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"പുതിയ കോൺടാക്റ്റ് സൃഷ്ടിക്കുക"</string>
<string name="starredList" msgid="4817256136413959463">"നക്ഷത്രമിട്ടവ"</string>
<string name="frequentList" msgid="7154768136473953056">"പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവർ"</string>
<string name="strequentList" msgid="5640192862059373511">"പ്രിയപ്പെട്ടവർ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"കോൺടാക്റ്റ് കാണുക"</string>
<string name="menu_addStar" msgid="2908478235715404876">"പ്രിയപ്പെട്ടവയിലേക്ക് ചേർക്കുക"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"പ്രിയപ്പെട്ടവയിൽ നിന്നും നീക്കംചെയ്യുക"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"പ്രിയപ്പെട്ടവയിൽ നിന്നും നീക്കംചെയ്തു"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"പ്രിയപ്പെട്ടവയിലേക്ക് ചേർത്തു"</string>
<string name="menu_editContact" msgid="9042415603857662633">"എഡിറ്റുചെയ്യുക"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ഇല്ലാതാക്കുക"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ഹോം സ്ക്രീനിൽ സ്ഥാപിക്കുക"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ പേരുകൾ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ഈ പ്രവർത്തനം കൈകാര്യം ചെയ്യാൻ അപ്ലിക്കേഷനുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്കുചെയ്യുക"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ഫോണ് നമ്പര് ചേര്ക്കുക"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ഇമെയില് ചേര്ക്കുക"</string>
<string name="missing_app" msgid="1466111003546611387">"ഈ പ്രവർത്തനം കൈകാര്യം ചെയ്യാൻ അപ്ലിക്കേഷനുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
<string name="menu_share" msgid="943789700636542260">"പങ്കിടുക"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"കോൺടാക്റ്റുകളിൽ ചേർക്കുക"</string>
<string name="share_via" msgid="563121028023030093">"ഇതുവഴി കോൺടാക്റ്റുകൾ പങ്കിടുക"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"അക്കൗണ്ടിന് കീഴിൽ ഗ്രൂപ്പ് സൃഷ്ടിക്കുക"</string>
<string name="audio_chat" msgid="2535716629358298691">"വോയ്സ് ചാറ്റ്"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ഈ ഫോട്ടോ ഉപയോഗിക്കുക"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ഈ അപ്ലിക്കേഷനിൽ നിന്നും എഡിറ്റുചെയ്യാനാകില്ല."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ഈ കോൺടാക്റ്റിനായി അധിക വിവരങ്ങൾ ഒന്നുമില്ല."</string>
<string name="group_read_only" msgid="1061762906115697637">"ഈ ഉപകരണത്തിൽ എഡിറ്റുചെയ്യാനാകില്ല."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"ഇതുപ്രകാരം ലിസ്റ്റ് അടുക്കുക"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"പേരിന്റെ ആദ്യഭാഗം"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"കുടുംബപ്പേര്"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"കോൺടാക്റ്റ് പേരുകൾ കാണുക"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"പേരിന്റെ ആദ്യഭാഗം ആദ്യം"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"കുടുംബപ്പേര് ആദ്യം"</string>
<string name="take_photo" msgid="7496128293167402354">"ഫോട്ടോ എടുക്കുക"</string>
<string name="take_new_photo" msgid="7341354729436576304">"പുതിയ ഫോട്ടോ എടുക്കുക"</string>
<string name="pick_photo" msgid="2129509985223564942">"ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="add_new_account" msgid="5748627740680940264">"പുതിയ അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ഡാറ്റാബേസ് ഫയലുകൾ എക്സ്പോർട്ടുചെയ്യുക"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ചിത്രം. മാറ്റാൻ തിരഞ്ഞെടുക്കുക"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"പുതിയ കോൺടാക്റ്റ് ചേർക്കുക"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"കൂടുതല് കാണുക"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"കുറച്ച് കാണുക"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"എല്ലാം കാണുക"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"കോൺടാക്റ്റ്"</string>
<string name="recent_card_title" msgid="8982782042698001695">"പുതിയത്"</string>
- <string name="about_card_title" msgid="2920942314212825637">"ആമുഖം"</string>
<string name="send_message" msgid="8938418965550543196">"സന്ദേശം അയയ്ക്കുക"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"ഒരു വ്യക്തിഗത പകർപ്പ് സൃഷ്ടിക്കുന്നു…"</string>
<string name="yesterday" msgid="6840858548955018569">"ഇന്നലെ"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 02d0b0b..c3bb7b6 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Харилцагчид"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Харилцагчид"</string>
+ <string name="people" msgid="1190841469952343354">"Харилцагчид"</string>
<string name="contactsList" msgid="8661624236494819731">"Харилцагчид"</string>
<string name="shortcutContact" msgid="749243779392912958">"Харилцагч"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Шууд залгах"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Залгах дугаарыг сонгоно уу"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Зурвас илгээх дугаарыг сонгох"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Харилцагч сонгоно уу"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Шинэ харилцагч үүсгэх"</string>
<string name="starredList" msgid="4817256136413959463">"Одтой"</string>
<string name="frequentList" msgid="7154768136473953056">"Байнга"</string>
<string name="strequentList" msgid="5640192862059373511">"Дуртай"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Харилцагчийг харах"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Таалагдсан руу нэмэх"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Дуртайгаас хасах"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Дуртайгаас хасах"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Дуртайд нэмэх"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Засах"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Устгах"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Үндсэн дэлгэц дээр байршуулах"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Таны харилцагчдын нэрс"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Тус үйлдлийг гүйцэтгэх апп олдсонгүй."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Өмнөх дэлгэц рүү буцахын тулд товших"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Утасны дугаар нэмэх"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Имэйл нэмэх"</string>
<string name="missing_app" msgid="1466111003546611387">"Тус үйлдлийг гүйцэтгэх апп олдсонгүй."</string>
<string name="menu_share" msgid="943789700636542260">"Хуваалцах"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Харилцагчдад нэмэх"</string>
<string name="share_via" msgid="563121028023030093">"Харилцагчийг дараахаар хуваалцах"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Акаунт дотор бүлгэм үүсгэх"</string>
<string name="audio_chat" msgid="2535716629358298691">"Дуут чат"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Энэ зургийг ашиглах"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Тус апп-с засварлах боломжгүй."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Тус харилцагчтай холбоотой нэмэлт мэдээлэл байхгүй байна."</string>
<string name="group_read_only" msgid="1061762906115697637">"Энэ төхөөрөмж дээр засах боломжгүй."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Жагсаалтыг дараахаар эрэмбэлэх"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Өөрийн нэр"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Овгийн нэр"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Харилцагчийн нэрсийг харах"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Өөрийн нэрийг өмнө оруулах"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Овгийн нэрийг эхэнд нь"</string>
<string name="take_photo" msgid="7496128293167402354">"Зураг авах"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Шинэ зураг авах"</string>
<string name="pick_photo" msgid="2129509985223564942">"Зураг сонгох"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Акаунт нэмэх"</string>
<string name="add_new_account" msgid="5748627740680940264">"Шинэ акаунт нэмэх"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Өгөгдлийн сангийн файлуудыг экспорт хийх"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Зураг. Өөрчлөхийн тулд сонгоно уу"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"шинэ харилцагч нэмэх"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Дэлгэрэнгүй үзэх"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Цөөнийг харах"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Бүгдийг харах"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Харилцагч"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Саяхны"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Тухай"</string>
<string name="send_message" msgid="8938418965550543196">"Зурвас илгээх"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Хувийн хуулбар үүсгэж байна..."</string>
<string name="yesterday" msgid="6840858548955018569">"Өчигдөр"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 9284115..96e738f 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"संपर्क"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"संपर्क"</string>
+ <string name="people" msgid="1190841469952343354">"संपर्क"</string>
<string name="contactsList" msgid="8661624236494819731">"संपर्क"</string>
<string name="shortcutContact" msgid="749243779392912958">"संपर्क"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"थेट डायल करा"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"कॉल करण्यासाठी एक नंबर निवडा"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"संदेश करण्यासाठी नंबर निवडा"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"संपर्क निवडा"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"नवीन संपर्क तयार करा"</string>
<string name="starredList" msgid="4817256136413959463">"तारांकित"</string>
<string name="frequentList" msgid="7154768136473953056">"वारंवार"</string>
<string name="strequentList" msgid="5640192862059373511">"आवडते"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"संपर्क पहा"</string>
<string name="menu_addStar" msgid="2908478235715404876">"आवडीमध्ये जोडा"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"आवडी मधून काढा"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"आवडींमधून काढले"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"आवडींमध्ये जोडले"</string>
<string name="menu_editContact" msgid="9042415603857662633">"संपादित करा"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"हटवा"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"मुख्यपृष्ठ स्क्रीन वर ठेवा"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"आपल्या संपर्कांची नावे"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ही क्रिया हाताळण्यासाठी कोणताही अॅप आढळला नाही."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"पूर्वीच्या स्क्रीनवर परत येण्यासाठी क्लिक करा"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"फोन नंबर जोडा"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ईमेल जोडा"</string>
<string name="missing_app" msgid="1466111003546611387">"ही क्रिया हाताळण्यासाठी कोणताही अॅप आढळला नाही."</string>
<string name="menu_share" msgid="943789700636542260">"सामायिक करा"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"संपर्कांमध्ये जोडा"</string>
<string name="share_via" msgid="563121028023030093">"द्वारे संपर्क सामायिक करा"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"खात्याअंतर्गत गट तयार करा"</string>
<string name="audio_chat" msgid="2535716629358298691">"व्हॉइस चॅट"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"हा फोटो वापरा"</string>
<string name="contact_read_only" msgid="7421346527289472273">"या अॅप वरून संपादन करण्यायोग्य नाही."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"या संपर्कासाठी कोणताही अतिरिक्त माहिती नाही."</string>
<string name="group_read_only" msgid="1061762906115697637">"या डिव्हाइसवर संपादन करण्यायोग्य नाही."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"यानुसार सूचीची क्रमवारी लावा"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"दिलेले नाव"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"कुटुंब नाव"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"संपर्क नावे पहा"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"प्रथम दिलेले नाव"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"प्रथम कुटुंब नाव"</string>
<string name="take_photo" msgid="7496128293167402354">"फोटो घ्या"</string>
<string name="take_new_photo" msgid="7341354729436576304">"नवीन फोटो घ्या"</string>
<string name="pick_photo" msgid="2129509985223564942">"फोटो निवडा"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"खाते जोडा"</string>
<string name="add_new_account" msgid="5748627740680940264">"नवीन खाते जोडा"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फाईल निर्यात करा"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"चित्र. बदल करण्यासाठी निवडा"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"नवीन संपर्क जोडा"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"अधिक पहा"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कमी पहा"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"सर्व पहा"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"संपर्क"</string>
<string name="recent_card_title" msgid="8982782042698001695">"अलीकडील"</string>
- <string name="about_card_title" msgid="2920942314212825637">"विषयी"</string>
<string name="send_message" msgid="8938418965550543196">"संदेश पाठवा"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"वैयक्तिक प्रत तयार करीत आहे..."</string>
<string name="yesterday" msgid="6840858548955018569">"काल"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index d85edc6..6d9094b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kenalan"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kenalan"</string>
+ <string name="people" msgid="1190841469952343354">"Kenalan"</string>
<string name="contactsList" msgid="8661624236494819731">"Kenalan"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kenalan"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Dail terus"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pilih nombor untuk memanggil"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pilih nombor untuk menghantar mesej"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pilih kenalan"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Buat kenalan baharu"</string>
<string name="starredList" msgid="4817256136413959463">"Dibintangkan"</string>
<string name="frequentList" msgid="7154768136473953056">"Kerap"</string>
<string name="strequentList" msgid="5640192862059373511">"Kegemaran"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Papar kenalan"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Tambah ke kegemaran"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Alih keluar daripada kegemaran"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Dialih keluar daripada kegemaran"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Ditambah ke kegemaran"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Padam"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Letakkan pada skrin Utama"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nama kenalan anda"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tiada aplikasi ditemui untuk mengendalikan tindakan ini."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik untuk kembali ke skrin sebelumnya"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Tambah nombor telefon"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Tambah e-mel"</string>
<string name="missing_app" msgid="1466111003546611387">"Tiada apl ditemui untuk mengendalikan tindakan ini."</string>
<string name="menu_share" msgid="943789700636542260">"Kongsi"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Tambahkan pada kenalan"</string>
<string name="share_via" msgid="563121028023030093">"Kongsi gambar melalui"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Buat kumpulan di bawah akaun"</string>
<string name="audio_chat" msgid="2535716629358298691">"Sembang suara"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Gunakan foto ini"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Tidak boleh diedit dari aplikasi ini."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Tiada maklumat tambahan untuk kenalan ini."</string>
<string name="group_read_only" msgid="1061762906115697637">"Tidak boleh diedit pada peranti ini."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Isih senarai mengikut"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nama berian"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nama keluarga"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Lihat nama kenalan"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama berian dahulu"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga dahulu"</string>
<string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ambil foto baru"</string>
<string name="pick_photo" msgid="2129509985223564942">"Pilih foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Tambah akaun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Tambah akaun baharu"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksport fail pangkalan data"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Gambar. Pilih untuk menukar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"tambah kenalan baharu"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Lihat lagi"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Lihat kurang"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Lihat semua"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kenalan"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Terbaharu"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Mengenai"</string>
<string name="send_message" msgid="8938418965550543196">"Hantar mesej"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Membuat salinan peribadi..."</string>
<string name="yesterday" msgid="6840858548955018569">"Semalam"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Acara tidak bertajuk)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Tetapkan"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"Organisasi"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Nama panggilan"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"Nota"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"Tapak web"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"Acara"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"Hubungan"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"arah ke lokasi"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"sms terbaru. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. klik untuk membalas"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"masuk"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"keluar"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tidak dijawab"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"panggilan terbaru. <xliff:g id="CALL_DETAILS">%s</xliff:g>. klik untuk memanggil kembali"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 9a41bfc..8fb80b1 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"အဆက်အသွယ်များ"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"အဆက်အသွယ်များ"</string>
+ <string name="people" msgid="1190841469952343354">"အဆက်အသွယ်များ"</string>
<string name="contactsList" msgid="8661624236494819731">"အဆက်အသွယ်များ"</string>
<string name="shortcutContact" msgid="749243779392912958">"အဆက်အသွယ်"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"တိုက်ရိုက်ခေါ်ဆိုခြင်း"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ခေါ်ဆိုရန် နံပါတ်တစ်ခုရွေးပါ"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"စာတိုပို့ရန် နံပါတ်တစ်ခုရွေးပါ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"လိပ်စာတစ်ခုရွေးပါ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"အဆက်အသွယ် အသစ် ဖန်တီးရန်"</string>
<string name="starredList" msgid="4817256136413959463">"စတားပေးထားသော အရာ"</string>
<string name="frequentList" msgid="7154768136473953056">"မကြာခဏ"</string>
<string name="strequentList" msgid="5640192862059373511">"အနှစ်သက်ဆုံးများ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"အဆက်အသွယ်အား ကြည့်ရန်"</string>
<string name="menu_addStar" msgid="2908478235715404876">"အနှစ်သက်ဆုံးများထဲ ထည့်ပါ"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"အနှစ်သက်ဆုံးများမှ ထုတ်ပါ"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"အကြိုက်ဆုံးများထဲမှ ထုတ်လိုက်ပါပြီ"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"အကြိုက်ဆုံးများ ထဲကို ထည့်ပြီး"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ပြင်ဆင်ရန်"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"ဖျက်ရန်"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ပင်မစာမျက်နှာတွင် တင်ထားပါ"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"အဆက်အသွယ်များ၏နာမည်များ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အပလီကေးရှင်း မရှိပါ။"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် ကလစ်ပါ"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ဖုန်း နံပါတ် ထည့်ရန်"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"အီးမေးလ် ထည့်ရန်"</string>
<string name="missing_app" msgid="1466111003546611387">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်မည့် အပလီကေးရှင်း မရှိပါ။"</string>
<string name="menu_share" msgid="943789700636542260">"မျှဝေခြင်း"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"အဆက်အသွယ်များ ထဲသို့ ထည့်ရန်"</string>
<string name="share_via" msgid="563121028023030093">"မှ အဆယ်အသွယ်အား မျှဝေခြင်း"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"အကောင့်အောက်မှာ အုပ်စုပြုလုပ်ပါ"</string>
<string name="audio_chat" msgid="2535716629358298691">"အသံဖြင့် ချက်တင်း"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ဒီပုံကို သုံးရန်"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ဤအပ်ပလီကေးရှင်းမှ ပြင်ခွင့်မရှိပါ"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ဤအဆက်အသွယ်အတွက် တစ်ခြား အပိုအချက်အလက်များမရှိပါ"</string>
<string name="group_read_only" msgid="1061762906115697637">"ဒီစက်ပေါ်မှာ ပြင်လို့ မရနိုင်ပါ"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"စာရင်းကို စီရန်"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ကိုယ်ပိုင်နာမည်"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"မိသားစုနာမည်"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"အဆက်အသွယ်နာမည်များအား ကြည့်ရန်"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ကိုယ်ပိုင်နာမည်အရင်"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"မိသားစုနာမည်အရင်"</string>
<string name="take_photo" msgid="7496128293167402354">"ဓာတ်ပုံရိုက်ရန်"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ဓာတ်ပုံအသစ်ရိုက်ပါ"</string>
<string name="pick_photo" msgid="2129509985223564942">"ပုံရွေးရန်"</string>
@@ -152,7 +152,7 @@
<string name="menu_display_all" msgid="8887488642609786198">"အားလုံးကို ပြသရန်"</string>
<string name="menu_select_all" msgid="621719255150713545">"အားလုံးရွေးရန်"</string>
<string name="menu_select_none" msgid="7093222469852132345">"အားလုံးရွေးထားမှု ဖျက်ပါ"</string>
- <string name="add_field" msgid="2384260056674995230">"တစ်ခြားအချက်အလက် ထည့်မယ်"</string>
+ <string name="add_field" msgid="2384260056674995230">"နောက်နေရာတစ်ခုထည့်ပါ"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"အသစ်ထည့်ရန်"</string>
<string name="add_organization" msgid="7311893231158291197">"အဖွဲ့အစည်းထည့်ရန်"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"ရက်စွဲ"</string>
@@ -184,7 +184,7 @@
<string name="social_widget_loading" msgid="5327336597364074608">"ဖွင့်နေစဉ်…"</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"အဆက်အသွယ်သစ်တစ်ခု ပြုလုပ်ပါ"</string>
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"အကောင့်တစ်ခုထဲသို့ ဝင်ပါ"</string>
- <string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"အဆက်အသွယ်များ တင်သွင်းပါ"</string>
+ <string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"လိပ်စားများ ထည့်ပါ"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"အုပ်စုသစ်ပြုလုပ်ရန်"</string>
<string name="create_group_item_label" msgid="4411981763169654825">"အုပ်စုအသစ်ပြုလုပ်ရန်"</string>
<plurals name="num_groups_in_account">
@@ -219,18 +219,19 @@
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"သင့် အဆက်အသွယ်အသစ်ကို အရံသိမ်းဆည်းထားခြင်း မရှိပါ။ အဆယ်အသွယ်များကို အွန်လိုင်းပေါ်မှာ အရံသိမ်းဆည်းပေးရန် အကောင့်သစ် ထပ်ထည့်ချင်ပါသလား"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"သင့်ရဲ့ အဆက်အသွယ်အသစ်ကို <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> နှင့် ထပ်တူဖြစ်အောင် ပြုလုပ်ပါမည်"</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"သင်ရဲ့အဆက်အသွယ် အသစ်ကို အောက်ပါ အကောင့်တွေထဲက တစ်ခုခုဖြင့် ထပ်တူဖြစ်အောင် ပြုလုပ်နိုင်ပါသည်။ ဘယ်တစ်ခုကို သုံးချင်ပါသလဲ?"</string>
- <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"အဆက်အသွယ်သစ် ထည့်မည်"</string>
+ <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"လိပ်စာအသစ် ပေါင်းမည်"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"အဆက်အသွယ်အားပြင်ရန်"</string>
<string name="keep_local" msgid="1258761699192993322">"ဖုန်းထဲတွင်သာသိမ်းပါ"</string>
<string name="add_account" msgid="8201790677994503186">"အကောင့်ထပ်ထည့်ရန်"</string>
<string name="add_new_account" msgid="5748627740680940264">"အကောင့်အသစ်ထည့်ပါ"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ဒေ့ဘာဘေ့စ်ဖိုင်များကို အပြင်သို့ထုတ်ပါ"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ပုံ. ပြောင်းရန် ရွေးပါ"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"အဆက်အသွယ် အသစ်ကို ထည့်ရန်"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ပိုပြီး ကြည့်ရန်"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"လျှော့ပြီး ကြည့်ရန်"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"အားလုံးကို ကြည့်ရန်"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"အဆက်အသွယ်"</string>
<string name="recent_card_title" msgid="8982782042698001695">"မကြာမီတုန်းက"</string>
- <string name="about_card_title" msgid="2920942314212825637">"အကြောင်း"</string>
<string name="send_message" msgid="8938418965550543196">"စာတို ပို့ရန်"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"ကိုယ်ပိုင် ကော်ပီကို ဖန်တီးနေ..."</string>
<string name="yesterday" msgid="6840858548955018569">"မနေ့က"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 726441d..909d596 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakter"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakter"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakter"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Ring"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Velg et nummer å ringe"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Velg et nummer å sende melding til"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Velg en kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Opprett ny kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Med stjerne"</string>
<string name="frequentList" msgid="7154768136473953056">"Mest brukt"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritter"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Se på kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Legg til som favoritt"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Fjern fra favoritter"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Fjernet fra favoritter"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Lagt til i favoritter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Rediger"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Slett"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Plassér på startsiden"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Navn på kontakter"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Det ble ikke funnet noen app som kan håndtere denne handlingen."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klikk for å gå tilbake til den forrige skjermen"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Legg til telefonnummer"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Legg til e-post"</string>
<string name="missing_app" msgid="1466111003546611387">"Kunne ikke finne noen app som kan håndtere denne handlingen."</string>
<string name="menu_share" msgid="943789700636542260">"Del"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Legg til i kontakter"</string>
<string name="share_via" msgid="563121028023030093">"Del kontakt via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Opprett gruppe under konto"</string>
<string name="audio_chat" msgid="2535716629358298691">"Taleprat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Bruk dette bildet"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Kan ikke redigeres fra denne appen."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Ingen utfyllende informasjon for denne kontakten."</string>
<string name="group_read_only" msgid="1061762906115697637">"Kan ikke redigeres på denne enheten."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sorter listen etter"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Fornavn"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Etternavn"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Se kontaktnavn"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Etternavn først"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta bilde"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ta nytt bilde"</string>
<string name="pick_photo" msgid="2129509985223564942">"Velg et bilde"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Legg til konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Legg til ny konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksporter databasefilene"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Bilde. Velg for å endre"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"legg til ny kontakt"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Se mer"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Se mindre"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Se alle"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nylige"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Info"</string>
<string name="send_message" msgid="8938418965550543196">"Send melding"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Oppretter personlig kopi …"</string>
<string name="yesterday" msgid="6840858548955018569">"I går"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 41117aa..534381e 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"सम्पर्कहरू"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"सम्पर्कहरू"</string>
+ <string name="people" msgid="1190841469952343354">"सम्पर्कहरू"</string>
<string name="contactsList" msgid="8661624236494819731">"सम्पर्क"</string>
<string name="shortcutContact" msgid="749243779392912958">"ठेगाना"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"सिधा डायल गर्नुहोस्"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"कल गर्नका लागि एउटा नम्बर छान्नुहोस्"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"सन्देश पठाउनका लागि एउटा नम्बर छान्नुहोस्"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"एउटा सम्पर्क छान्नुहोस्"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
<string name="starredList" msgid="4817256136413959463">"ताराङ्कित"</string>
<string name="frequentList" msgid="7154768136473953056">"कहिले कहीँ"</string>
<string name="strequentList" msgid="5640192862059373511">"मनपर्नेहरू"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"सम्पर्क हेर्नुहोस्"</string>
<string name="menu_addStar" msgid="2908478235715404876">"मनपर्नेहरूमा थप्नुहोस्"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"मनपर्नेहरूबाट हटाउनुहोस्"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"मनपर्नेहरूबाट हटाइयो"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"मनपर्नेमा थपियो"</string>
<string name="menu_editContact" msgid="9042415603857662633">"सम्पादन गर्नुहोस्"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"मेट्नुहोस्"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"होम स्क्रिनमा राख्नुहोस्"</string>
@@ -109,7 +105,7 @@
</plurals>
<string name="all_contacts_tab_label" msgid="6250372293594147703">"सबै सम्पर्कहरू"</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"मनपर्ने"</string>
- <string name="callBack" msgid="5498224409038809224">"कल फर्काउने"</string>
+ <string name="callBack" msgid="5498224409038809224">"कल ब्याक"</string>
<string name="callAgain" msgid="3197312117049874778">"फेरि कल गर्नुहोस्"</string>
<string name="returnCall" msgid="8171961914203617813">"कल फर्काउनुहोस्"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" लाई सम्पर्कमा थप्ने?"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"तपाईँका सम्पर्कहरूका नामहरू"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"यो कार्य सम्हाल्न कुनै पनि अनुप्रयोग पाइएन।"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"अघिल्लो पर्दामा फर्कनको लागि क्लिक गर्नुहोस्"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"फोन नम्बर थप्नुहोस्"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"इमेल थप्नुहोस्"</string>
<string name="missing_app" msgid="1466111003546611387">"यो कार्य सम्हाल्न कुनै पनि अनुप्रयोग पाइएन।"</string>
<string name="menu_share" msgid="943789700636542260">"साझेदारी गर्नुहोस्"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"सम्पर्कहरूमा थप्नुहोस्"</string>
<string name="share_via" msgid="563121028023030093">"मार्फत सम्पर्क साझेदारी गर्नुहोस्"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"खाता अन्तर्गत समूह बनाउनुहोस्"</string>
<string name="audio_chat" msgid="2535716629358298691">"भ्वाइस च्याट"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"यो फोटाको प्रयोग गर्नुहोस्"</string>
<string name="contact_read_only" msgid="7421346527289472273">"यो अनुप्रयोगबाट सम्पादन गर्न नमिल्ने।"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"यो सम्पर्कको कुनै अतिरिक्त जानकारी छैन।"</string>
<string name="group_read_only" msgid="1061762906115697637">"यस उपकरणमा सम्पादनयोग्य छैन।"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"सूचिलाई क्रमबद्ध गर्नुहोस्"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"दिइएको नाम"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"परिवार नाम"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"सम्पर्क नामहरू हेर्नुहोस्"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"दिइएको नाम"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"थर पहिले"</string>
<string name="take_photo" msgid="7496128293167402354">"तस्वीर लिनुहोस्"</string>
<string name="take_new_photo" msgid="7341354729436576304">"नयाँ फोटो खिच्नुहोस्"</string>
<string name="pick_photo" msgid="2129509985223564942">"फोटो छान्नुहोस्"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"खाता थप गर्नुहोस्"</string>
<string name="add_new_account" msgid="5748627740680940264">"नयाँ खाता थप्नुहोस्"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फाइलहरू निर्यात गर्नुहोस्"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"चित्र। परिवर्तन गर्न छान्नुहोस्"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"नयाँ सम्पर्क थप्नुहोस्"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"थप हेर्नुहोस्"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कम हेर्नुहोस्"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"सबै हेर्नुहोस्"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"सम्पर्क"</string>
<string name="recent_card_title" msgid="8982782042698001695">"हालैको"</string>
- <string name="about_card_title" msgid="2920942314212825637">"बारेमा"</string>
<string name="send_message" msgid="8938418965550543196">"सन्देश पठाउनुहोस्"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"व्यक्तिगत प्रतिलिपि बनाउँदै..."</string>
<string name="yesterday" msgid="6840858548955018569">"हिजो"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 905d6fe..6cae77e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contacten"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contacten"</string>
+ <string name="people" msgid="1190841469952343354">"Contacten"</string>
<string name="contactsList" msgid="8661624236494819731">"Contacten"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacten"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direct bellen"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Kies een nummer om te bellen"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Kies een nummer voor bericht"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Een contact kiezen"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Nieuw contact maken"</string>
<string name="starredList" msgid="4817256136413959463">"Met ster"</string>
<string name="frequentList" msgid="7154768136473953056">"Vaak"</string>
<string name="strequentList" msgid="5640192862059373511">"Favorieten"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Contact weergeven"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Toevoegen aan favorieten"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Uit favorieten verwijderen"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Verwijderd uit favorieten"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Aan favorieten toegevoegd"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Bewerken"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Verwijderen"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Op startscherm plaatsen"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Namen van uw contacten"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Er is geen app gevonden om deze actie uit te voeren."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik om terug te keren naar het vorige scherm"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefoonnummer toevoegen"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"E-mailadres toevoegen"</string>
<string name="missing_app" msgid="1466111003546611387">"Er is geen app gevonden om deze actie uit te voeren."</string>
<string name="menu_share" msgid="943789700636542260">"Delen"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Toevoegen aan contacten"</string>
<string name="share_via" msgid="563121028023030093">"Contact delen via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Groep in account maken"</string>
<string name="audio_chat" msgid="2535716629358298691">"Voicechat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Deze foto gebruiken"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Kan niet worden bewerkt vanuit deze app."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Geen aanvullende gegevens voor dit contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Kan niet worden bewerkt op dit apparaat."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Lijst sorteren op"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Roepnaam"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Achternaam"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Contactnamen weergeven"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Roepnaam eerst"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Achternaam eerst"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto maken"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Nieuwe foto nemen"</string>
<string name="pick_photo" msgid="2129509985223564942">"Foto kiezen"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Account toevoegen"</string>
<string name="add_new_account" msgid="5748627740680940264">"Nieuw account toevoegen"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Databasebestanden exporteren"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Foto. Selecteer om te wijzigen"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"nieuw contact toevoegen"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Meer weergeven"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Minder weergeven"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Alles weergeven"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recent"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Over"</string>
<string name="send_message" msgid="8938418965550543196">"Bericht verzenden"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Een persoonlijke kopie maken..."</string>
<string name="yesterday" msgid="6840858548955018569">"Gisteren"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 31f136e..be5ab26 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakty"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakty"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakty"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Telefon do osoby"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Wybierz numer, aby nawiązać połączenie"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Wybierz numer, aby wysłać wiadomość"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Wybierz kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Utwórz nowy kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Oznaczony gwiazdką"</string>
<string name="frequentList" msgid="7154768136473953056">"Częste"</string>
<string name="strequentList" msgid="5640192862059373511">"Ulubione"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Wyświetl kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Dodaj do ulubionych"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Usuń z ulubionych"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Usunięto z ulubionych"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Dodano do ulubionych"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Edytuj"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Usuń"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Umieść na ekranie głównym"</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"Znaleziono: 1"</item>
<item quantity="other" msgid="7988132539476575389">"Znaleziono: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Wszystkie"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Wszys. kontakty"</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Ulubione"</string>
<string name="callBack" msgid="5498224409038809224">"Oddzwoń"</string>
<string name="callAgain" msgid="3197312117049874778">"Zadzwoń ponownie"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Imiona i nazwiska oraz nazwy w Twoich kontaktach"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nie znaleziono aplikacji do obsługi tego działania."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknij, by wrócić do poprzedniego ekranu"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Dodaj numer telefonu"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Dodaj adres e-mail"</string>
<string name="missing_app" msgid="1466111003546611387">"Nie znaleziono aplikacji do obsługi tego działania."</string>
<string name="menu_share" msgid="943789700636542260">"Udostępnij"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Dodaj do kontaktów"</string>
<string name="share_via" msgid="563121028023030093">"Udostępnij kontakt przez"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Utwórz grupę na koncie"</string>
<string name="audio_chat" msgid="2535716629358298691">"Czat głosowy"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Użyj tego zdjęcia"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nie można edytować w tej aplikacji."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Brak dodatkowych informacji dla tego kontaktu"</string>
<string name="group_read_only" msgid="1061762906115697637">"Nie można edytować na tym urządzeniu."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortuj listę według"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Imię"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Nazwisko"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Wyświetl nazwy kontaktów"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najpierw imię"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najpierw nazwisko"</string>
<string name="take_photo" msgid="7496128293167402354">"Zrób zdjęcie"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Zrób nowe zdjęcie"</string>
<string name="pick_photo" msgid="2129509985223564942">"Wybierz zdjęcie"</string>
@@ -218,19 +218,20 @@
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"Dodaj konto"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Kopia zapasowa nowego kontaktu nie zostanie utworzona. Dodać konto, na którym kopie zapasowe kontaktów będą tworzone online?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"Nowy kontakt zostanie zsynchronizowany z kontem <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
- <string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Nowy kontakt możesz zsynchronizować z dowolnym kontem. Którego konta chcesz użyć?"</string>
+ <string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Nowy kontakt możesz zsynchronizować z dowolnym kontem. Którego chcesz użyć?"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj nowy kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Edytuj kontakt"</string>
<string name="keep_local" msgid="1258761699192993322">"Przechowuj lokalnie"</string>
<string name="add_account" msgid="8201790677994503186">"Dodaj konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj nowe konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Eksportuj pliki bazy danych"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Zdjęcie. Wybierz, aby je zmienić"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"dodaj nowy kontakt"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Pokaż więcej"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Pokaż mniej"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Pokaż wszystkie"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Ostatnie"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Informacje"</string>
<string name="send_message" msgid="8938418965550543196">"Wyślij wiadomość"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Kopiuję do osobistych..."</string>
<string name="yesterday" msgid="6840858548955018569">"Wczoraj"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2e738ac..f2d13f3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contactos"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contactos"</string>
+ <string name="people" msgid="1190841469952343354">"Contactos"</string>
<string name="contactsList" msgid="8661624236494819731">"Contactos"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contacto"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Marcação directa"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Seleccionar um número a marcar"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Seleccionar um número para enviar mensagem"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Escolher um contacto"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Criar novo contacto"</string>
<string name="starredList" msgid="4817256136413959463">"Marcado com estrela"</string>
<string name="frequentList" msgid="7154768136473953056">"Frequentes"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritos"</string>
@@ -41,11 +39,9 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Visualizar contacto"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Adicionar aos favoritos"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Remover dos favoritos"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Removido dos favoritos"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Adicionado aos favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Eliminar"</string>
- <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar no ecrã principal"</string>
+ <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar no Ecrã principal"</string>
<string name="menu_call" msgid="3992595586042260618">"Ligar para contacto"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Enviar SMS/MMS para contacto"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"Separar"</string>
@@ -63,7 +59,7 @@
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contactos"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"Contactos associados"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Definir toque"</string>
- <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas as cham. p/ correio voz"</string>
+ <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas chm. para corr. de voz"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Não pode eliminar contactos de contas só de leitura, mas pode ocultá-los nas suas listas de contactos."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Este contacto contém informações de várias contas. As informações de contas só de leitura serão ocultadas nas suas listas de contactos, mas não eliminadas."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"A eliminação deste contacto eliminará informações de várias contas."</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrado(s)"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Todos"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Todos os cont."</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Favoritos"</string>
<string name="callBack" msgid="5498224409038809224">"Chamada de retorno"</string>
<string name="callAgain" msgid="3197312117049874778">"Ligar novamente"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Não foram encontradas aplicações para executar esta ação"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Clique para regressar ao ecrã anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Adicionar número de telefone"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Adicionar email"</string>
<string name="missing_app" msgid="1466111003546611387">"Não foram encontradas aplicações para executar esta ação."</string>
<string name="menu_share" msgid="943789700636542260">"Partilhar"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Adicionar aos contactos"</string>
<string name="share_via" msgid="563121028023030093">"Partilhar contacto através de"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Criar grupo na conta"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizar esta fotografia"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Não editável a partir desta aplicação."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Não há informações adicionais para este contacto"</string>
<string name="group_read_only" msgid="1061762906115697637">"Não editável neste aparelho"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ordenar lista por"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome próprio"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apelido"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Ver nomes de contactos"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome próprio em primeiro lugar"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelido em primeiro lugar"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar fotografia"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tirar nova fotografia"</string>
<string name="pick_photo" msgid="2129509985223564942">"Escolher fotografia"</string>
@@ -179,7 +179,7 @@
<string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Adicionar ao contacto"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Fechar"</string>
<string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
- <string name="date_year_toggle" msgid="7356532842767854606">"Escolha um ano"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Indique um ano"</string>
<string name="social_widget_label" msgid="6378905543028924592">"Contacto"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"A carregar…"</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Criar novo contacto"</string>
@@ -219,18 +219,19 @@
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Não será efetuada cópia de segurança do novo contacto. Adicionar uma conta que efetua a cópia de segurança dos contactos on-line?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"O novo contacto será sincronizado com <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"Pode sincronizar o novo contacto com uma das seguintes contas. Qual a conta que deseja utilizar?"</string>
- <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adicionar novo contacto"</string>
+ <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Adic. novo contacto"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
<string name="keep_local" msgid="1258761699192993322">"Manter localmente"</string>
<string name="add_account" msgid="8201790677994503186">"Adicionar conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adicionar nova conta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar ficheiros da base de dados"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Imagem. Selecione para alterar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"adicionar novo contacto"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ver mais"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ver menos"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ver tudo"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contacto"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recentes"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Acerca de"</string>
<string name="send_message" msgid="8938418965550543196">"Enviar mensagem"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"A criar uma cópia pessoal..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ontem"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f1ef21..0bc6f10 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Contatos"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Contatos"</string>
+ <string name="people" msgid="1190841469952343354">"Contatos"</string>
<string name="contactsList" msgid="8661624236494819731">"Contatos"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contato"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Discagem direta"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Escolha um número a ser chamado"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Escolha um número para enviar uma mensagem"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Escolha um contato"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Criar novo contato"</string>
<string name="starredList" msgid="4817256136413959463">"Com estrela"</string>
<string name="frequentList" msgid="7154768136473953056">"Frequente"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoritos"</string>
@@ -41,12 +39,10 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ver contato"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Adicionar aos favoritos"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Remover dos favoritos"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Removido dos favoritos"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Adicionado aos favoritos"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editar"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Excluir"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Colocar na tela inicial"</string>
- <string name="menu_call" msgid="3992595586042260618">"Ligar para contato"</string>
+ <string name="menu_call" msgid="3992595586042260618">"Chamar contato"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Enviar SMS/MMS para o contato"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"Separar"</string>
<string name="menu_editGroup" msgid="5062005185370983720">"Editar"</string>
@@ -110,20 +106,17 @@
<string name="all_contacts_tab_label" msgid="6250372293594147703">"Todos"</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Favoritos"</string>
<string name="callBack" msgid="5498224409038809224">"Retornar chamada"</string>
- <string name="callAgain" msgid="3197312117049874778">"Ligar novamente"</string>
+ <string name="callAgain" msgid="3197312117049874778">"Chamar novamente"</string>
<string name="returnCall" msgid="8171961914203617813">"Retornar chamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contatos?"</string>
<string name="description_contact_photo" msgid="3387458082667894062">"foto do contato"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contatos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos seus contatos"</string>
- <string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum app foi encontrado para executar esta ação."</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum aplicativo foi encontrado para executar esta ação."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Clique para retornar à tela anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Adicionar número de telefone"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Adicionar e-mail"</string>
- <string name="missing_app" msgid="1466111003546611387">"Nenhum app foi encontrado para executar esta ação."</string>
+ <string name="missing_app" msgid="1466111003546611387">"Nenhum aplicativo foi encontrado para executar esta ação."</string>
<string name="menu_share" msgid="943789700636542260">"Compartilhar"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Adicionar aos contatos"</string>
<string name="share_via" msgid="563121028023030093">"Compartilhar contato via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Criar grupo na conta"</string>
<string name="audio_chat" msgid="2535716629358298691">"Bate-papo por voz"</string>
@@ -136,8 +129,15 @@
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Usar esta foto"</string>
- <string name="contact_read_only" msgid="7421346527289472273">"Não pode ser editado neste app."</string>
+ <string name="contact_read_only" msgid="7421346527289472273">"Não pode ser editado neste aplicativo."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Não há informações adicionais para este contato."</string>
<string name="group_read_only" msgid="1061762906115697637">"Não é possível editar neste dispositivo."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Classificar lista por"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sobrenome"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Visualizar nomes de contatos"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome primeiro"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sobrenome primeiro"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tirar outra foto"</string>
<string name="pick_photo" msgid="2129509985223564942">"Escolher foto"</string>
@@ -145,7 +145,7 @@
<string name="locale_change_in_progress" msgid="7583992153091537467">"A lista de contatos está sendo atualizada para incorporar a alteração do idioma."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"A lista de contatos está sendo atualizada."</string>
<string name="upgrade_out_of_memory" msgid="1209994418877625940">"Os contatos estão sendo atualizados no momento. \n\nO processo de atualização requer aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB de armazenamento interno.\n\nEscolha uma das seguintes opções:"</string>
- <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Desinstalar alguns apps"</string>
+ <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Desinstalar alguns aplicativos"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Tentar atualizar novamente"</string>
<string name="search_results_searching" msgid="3984833028938569930">"Pesquisando..."</string>
<string name="menu_display_selected" msgid="6470001164297969034">"Mostrar selecionados"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Adicionar conta"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adicionar nova conta"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportar arquivos do banco de dados"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Imagem. Selecione para alterar"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"adicionar novo contato"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ver mais"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Ver menos"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Ver tudo"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contato"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recente"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Sobre"</string>
<string name="send_message" msgid="8938418965550543196">"Enviar mensagem"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Criando uma cópia pessoal..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ontem"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sem título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Definir"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"Mensagem instantânea"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"Organização"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Apelido"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"Nota"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"Site"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"Evento"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"Relação"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"rotas até o local"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"sms recente. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. clique para responder"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrada"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saída"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"chamada recente. <xliff:g id="CALL_DETAILS">%s</xliff:g>. clique para retornar a chamada"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e170030..f3f0dd1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Agendă"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Agendă"</string>
+ <string name="people" msgid="1190841469952343354">"Agendă"</string>
<string name="contactsList" msgid="8661624236494819731">"Agendă"</string>
<string name="shortcutContact" msgid="749243779392912958">"Persoană din Agendă"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Apel direct"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Alegeţi un număr pentru apelare"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Alegeţi un număr pentru trimiterea mesajului"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Alegeţi o persoană de contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Creați intrare nouă în Agendă"</string>
<string name="starredList" msgid="4817256136413959463">"Cu stea"</string>
<string name="frequentList" msgid="7154768136473953056">"Frecvent"</string>
<string name="strequentList" msgid="5640192862059373511">"Favorite"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Vizualizaţi persoana din agendă"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Adăugaţi la lista de favorite"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Eliminaţi din lista de favorite"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"S-a eliminat din preferințe"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Adăugat la preferințe"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Editaţi"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ștergeţi"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Plasaţi în ecranul de pornire"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Numele persoanelor din agenda dvs."</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nu s-a găsit o aplicaţie care să gestioneze această acţiune."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Dați clic pentru a reveni la ecranul anterior"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Adăugați un număr de telefon"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Adăugaţi o adresă de e-mail"</string>
<string name="missing_app" msgid="1466111003546611387">"Nu s-a găsit o aplicație care să îndeplinească această acțiune."</string>
<string name="menu_share" msgid="943789700636542260">"Distribuiţi"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Adăugați în Agendă"</string>
<string name="share_via" msgid="563121028023030093">"Distribuiţi persoana din agendă prin"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Creaţi un grup în contul"</string>
<string name="audio_chat" msgid="2535716629358298691">"Chat vocal"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizaţi această fotografie"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nu se poate edita din această aplicaţie"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nu există informaţii suplimentare pentru acest contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nu poate fi editat pe acest dispozitiv."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortaţi lista după"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prenume"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Numele de familie"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Afișați numele persoanei de contact"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Întâi prenumele"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Întâi numele de familie"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotografiaţi"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Creaţi o fotografie nouă"</string>
<string name="pick_photo" msgid="2129509985223564942">"Alegeți o fotografie"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Adăugaţi un cont"</string>
<string name="add_new_account" msgid="5748627740680940264">"Adăugaţi un cont nou"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportaţi fişierele bazei de date"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Fotografie. Selectați pentru a schimba."</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"adăugați o persoană de contact nouă"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Mai multe detalii"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Mai puține detalii"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Vedeți tot"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Recente"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Despre"</string>
<string name="send_message" msgid="8938418965550543196">"Trimiteți mesajul"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Se creează o copie personală..."</string>
<string name="yesterday" msgid="6840858548955018569">"Ieri"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Eveniment fără titlu)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Setați"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"Organizaţie"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Pseudonim"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"Notă"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"Site web"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"Eveniment"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"Relaţie"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"indicații de orientare către locație"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"SMS recent. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. Dați clic pentru a răspunde"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"primit"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"efectuat"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"pierdut"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"Apel recent. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Dați clic pentru a apela"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"Dvs.: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1f6fa51..149d6e7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контакты"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контакты"</string>
+ <string name="people" msgid="1190841469952343354">"Контакты"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакты"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Быстрый звонок"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Выберите номер для вызова"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Выбрать номер для отправки сообщения"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Выбор контакта"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Добавить контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Помеченные"</string>
<string name="frequentList" msgid="7154768136473953056">"Часто вызываемые"</string>
<string name="strequentList" msgid="5640192862059373511">"Избранное"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Просмотреть контакт"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Добавить в избранное"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Удалить из избранных"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Удалено из избранного"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Добавлено в избранное"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Изменить"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Удалить"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Поместить на главный экран"</string>
@@ -80,7 +76,7 @@
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"На планшетном ПК нет изображений."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"В телефоне нет картинок."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Фотография контакта"</string>
- <string name="customLabelPickerTitle" msgid="1081475101983255212">"Название"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Название ярлыка"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Направлять вызовы в голосовую почту"</string>
<string name="removePhoto" msgid="4898105274130284565">"Удалить фото"</string>
<string name="noContacts" msgid="8579310973261953559">"Нет контактов."</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Имена контактов"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Действие не поддерживается ни в одном приложении."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Нажмите, чтобы вернуться на предыдущую страницу"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Добавить номер телефона"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Добавить адрес электронной почты"</string>
<string name="missing_app" msgid="1466111003546611387">"Действие не поддерживается ни в одном приложении."</string>
<string name="menu_share" msgid="943789700636542260">"Отправить"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Добавить в контакты"</string>
<string name="share_via" msgid="563121028023030093">"Способ отправки"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Создание группы в аккаунте"</string>
<string name="audio_chat" msgid="2535716629358298691">"Голосовой чат"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Использовать эту фотографию"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Здесь доступно только для чтения."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Нет других данных об этом контакте."</string>
<string name="group_read_only" msgid="1061762906115697637">"Здесь доступно только для чтения."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Упорядочить контакты"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"По имени"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"По фамилии"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Показать контакты"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Сначала имя"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Сначала фамилию"</string>
<string name="take_photo" msgid="7496128293167402354">"Сфотографировать"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Сфотографировать"</string>
<string name="pick_photo" msgid="2129509985223564942">"Выбрать фото"</string>
@@ -183,7 +183,7 @@
<string name="social_widget_label" msgid="6378905543028924592">"Контакт"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"Загрузка..."</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Создать новый контакт"</string>
- <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Войти в аккаунт"</string>
+ <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Войдите в аккаунт"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Импортировать контакты"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Создание новой группы"</string>
<string name="create_group_item_label" msgid="4411981763169654825">"Создать группу"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Добавить аккаунт"</string>
<string name="add_new_account" msgid="5748627740680940264">"Добавить аккаунт"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Экспорт файлов базы данных"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Изображение (нажмите, чтобы изменить)"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"Добавить контакт"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ещё"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Свернуть"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Показать все"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Недавние"</string>
- <string name="about_card_title" msgid="2920942314212825637">"О контакте"</string>
<string name="send_message" msgid="8938418965550543196">"Отправить сообщение"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Копирование…"</string>
<string name="yesterday" msgid="6840858548955018569">"Вчера"</string>
@@ -239,7 +240,7 @@
<string name="today_at_time_fmt" msgid="605665249491030460">"Сегодня, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Завтра, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="untitled_event" msgid="3484859385405939366">"(событие без названия)"</string>
+ <string name="untitled_event" msgid="3484859385405939366">"(мероприятие без названия)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Установить"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Чат"</string>
<string name="header_organization_entry" msgid="8515394955666265406">"Организация"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 0c3e048..27cabcf 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"සම්බන්ධතා"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"සම්බන්ධතා"</string>
+ <string name="people" msgid="1190841469952343354">"සම්බන්ධතා"</string>
<string name="contactsList" msgid="8661624236494819731">"සම්බන්ධතා"</string>
<string name="shortcutContact" msgid="749243779392912958">"සම්බන්ධතාවය"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ඍජු ඇමතීම"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"ඇමතීමට අංකයක් තෝරාගන්න"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"පණිවිඩයක් යැවීමට අංකයක් තෝරාගන්න"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"සම්බන්ධතාවයක් තෝරාගන්න"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"නව සම්බන්ධතාවයක් නිර්මාණය කරන්න"</string>
<string name="starredList" msgid="4817256136413959463">"තරුව සලකුණු කළ"</string>
<string name="frequentList" msgid="7154768136473953056">"නිතර"</string>
<string name="strequentList" msgid="5640192862059373511">"ප්රියතම"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"සම්බන්ධතාව පෙන්වන්න"</string>
<string name="menu_addStar" msgid="2908478235715404876">"ප්රියතම වලට එක් කරන්න"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"ප්රියතම වලින් ඉවත් කරන්න"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"ප්රියතමයන්ගෙන් ඉවත් කරන්න"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"ප්රියතමයන් වෙත එකතු කරන්න"</string>
<string name="menu_editContact" msgid="9042415603857662633">"සංස්කරණය කරන්න"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"මකන්න"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"මුල් තිරයෙහි තබන්න"</string>
@@ -55,7 +51,7 @@
<string name="menu_new_group_action_bar" msgid="3520232877587377175">"කණ්ඩායමක් එක් කරන්න"</string>
<string name="splitConfirmation_title" msgid="633640935430370530">"සම්බන්ධතාව වෙන් කරන්නද?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"මෙම සම්බන්ධතාවය සම්බන්ධතා කිහිපයකට වෙන් කෙරෙනු ඇත."</string>
- <string name="menu_joinAggregate" msgid="5027981918265667970">"සම්බන්ධ කරන්න"</string>
+ <string name="menu_joinAggregate" msgid="5027981918265667970">"එකතු වන්න"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"සම්බන්ධතා එකතු කරන්න"</string>
<string name="blurbJoinContactDataWith" msgid="8736488417422708236">"<xliff:g id="NAME">%s</xliff:g> සමඟ එක් කළ යුතු සම්බන්ධතාවය තෝරන්න:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"සියලු සම්බන්ධතා පෙන්වන්න"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"ඔබගේ සම්බන්ධතා වල නම්"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"මෙම ක්රියාව හැසිරවීමට යෙදුමක් සොයාගත්තේ නැත"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"පෙර තිරයට යෑම ආපසු යෑම ක්ලික් කරන්න"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"දුරකථන අංකයක් එකතු කරන්න"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ඊ-තැපෑලක් එකතු කරන්න"</string>
<string name="missing_app" msgid="1466111003546611387">"මෙම ක්රියාව හැසිරවීමට යෙදුමක් සොයාගත්තේ නැත"</string>
<string name="menu_share" msgid="943789700636542260">"බෙදාගන්න"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"සම්බන්ධතා වලට එක් කරන්න"</string>
<string name="share_via" msgid="563121028023030093">"ඔස්සේ සම්බන්ධතාවය බෙදාගන්න"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ගිණුම යටතේ කණ්ඩායමක් නිර්මාණය කරන්න"</string>
<string name="audio_chat" msgid="2535716629358298691">"හඬ කතාබහ"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"මෙම ඡායාරූපය භාවිත කරන්න"</string>
<string name="contact_read_only" msgid="7421346527289472273">"මෙම යෙදුමෙන් සංස්කරණය කළ නොහැක."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"මෙම සම්බන්ධතාවයට අමතර තොරතුරු නොමැත."</string>
<string name="group_read_only" msgid="1061762906115697637">"මෙම උපාංගයෙහි සංස්කරණය කළ නොහැක"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"මඟින් ලැයිස්තුව අනුපිළිවෙලට සකසන්න"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ලබාදුන් නම"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"වාසගම"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"සම්බන්ධතා නම් පෙන්වන්න"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ලබාදුන් නම මුලින්"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"වාසගම මුලින්"</string>
<string name="take_photo" msgid="7496128293167402354">"ඡායාරූපය ගන්න"</string>
<string name="take_new_photo" msgid="7341354729436576304">"නව ඡායාරූපයක් ගන්න"</string>
<string name="pick_photo" msgid="2129509985223564942">"ඡායාරූපය තෝරන්න"</string>
@@ -219,18 +219,19 @@
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"ඔබගේ නව සම්බන්ධතාවය උපස්ථ නොවනු ඇත. ඔබගේ සම්බන්ධතා සබැඳිව උපස්ථ කරන ගිණුමක් එක් කරන්නද?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"ඔබගේ නව සම්බන්ධතාවය <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> සමඟ සමමුහුර්ත වනු ඇත."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"ඔබගේ පහත ගිණුම් වලින් එකක් සමඟ ඔබගේ නව සම්බන්ධතාවය සමමුහුර්ත කළ හැක. ඔබට භාවිතා කිරීමට අවශ්ය කුමක්ද?"</string>
- <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"නව සම්බන්ධතාව එක් කරන්න"</string>
+ <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"නව සම්බන්ධතා එකතු කරන්න"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"සම්බන්ධතාව සංස්කරණය කරන්න"</string>
<string name="keep_local" msgid="1258761699192993322">"පෙදෙසිව තබාගන්න"</string>
<string name="add_account" msgid="8201790677994503186">"ගිණුමක් එකතු කරන්න"</string>
<string name="add_new_account" msgid="5748627740680940264">"නව ගිණුමක් එක් කරන්න"</string>
<string name="menu_export_database" msgid="2659719297530170820">"දත්ත සමුදා ගොනු නිර්යාත කරන්න"</string>
- <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"නව සම්බන්ධතාව එක් කරන්න"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"පින්තූරය. වෙනස් කිරීමට තෝරාගන්න"</string>
+ <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"නව සම්බන්ධතා එකතු කරන්න"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"තව බලන්න"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"අඩුවෙන් බලන්න"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"සියල්ල බලන්න"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"සම්බන්ධතාවය"</string>
<string name="recent_card_title" msgid="8982782042698001695">"මෑත"</string>
- <string name="about_card_title" msgid="2920942314212825637">"පිළිබඳ"</string>
<string name="send_message" msgid="8938418965550543196">"පණිවිඩය යවන්න"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"පුද්ගලික පිටපතක් නිර්මාණය කරමින්..."</string>
<string name="yesterday" msgid="6840858548955018569">"ඊයේ"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(නම් නොකළ සිදුවීම)"</string>
<string name="date_time_set" msgid="4761419824439606690">"සකසන්න"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"සංවිධානය"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"අපනාමය"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"සටහන"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"වෙබ් අඩවිය"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"සිදුවීම"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"සම්බන්ධතාව"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"ස්ථානයට දිශාවන්"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"මෑත කදී ආ sms. <xliff:g id="MESSAGE_DETAILS">%s</xliff:g>. ප්රතිචාර දැක්වීමට ක්ලික් කරන්න"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ඇතුළට එන"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"පිටතට යන"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"හමු නොවී යන ලදි"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"මෑත ඇමතුම්. <xliff:g id="CALL_DETAILS">%s</xliff:g>. ආපසු ඇමැතීමට ක්ලික් කරන්න"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"ඔබ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9528363..4fc33f6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakty"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakty"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakty"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakty"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Priame vytáčanie"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Výber čísla pre hovor"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Výber čísla pre správu"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Vyberte kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Vytvoriť nový kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Označené hviezdičkou"</string>
<string name="frequentList" msgid="7154768136473953056">"Časté"</string>
<string name="strequentList" msgid="5640192862059373511">"Obľúbené"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Zobraziť kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Pridať medzi obľúbené položky"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Odstrániť z obľúbených"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Odstránené z obľúbených"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Pridané medzi obľúbené"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Upraviť"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Odstrániť"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Umiestniť na plochu"</string>
@@ -80,7 +76,7 @@
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"V tablete nie sú k dispozícii žiadne fotografie."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"V telefónne nie sú žiadne fotografie."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Fotka kontaktu"</string>
- <string name="customLabelPickerTitle" msgid="1081475101983255212">"Názov štítku"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Vlastný názov menovky"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Presmerovať hovory priamo do hlasovej schránky"</string>
<string name="removePhoto" msgid="4898105274130284565">"Odstrániť fotografiu"</string>
<string name="noContacts" msgid="8579310973261953559">"Žiadne kontakty."</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Mená vašich kontaktov"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknutím na tlačidlo sa vrátite na predchádzajúcu obrazovku."</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Pridať telefónne číslo"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Pridať e-mailovú adresu"</string>
<string name="missing_app" msgid="1466111003546611387">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla."</string>
<string name="menu_share" msgid="943789700636542260">"Zdieľať"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Pridať do kontaktov"</string>
<string name="share_via" msgid="563121028023030093">"Zdieľať kontakt pomocou"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Vytvoriť skupinu v účte"</string>
<string name="audio_chat" msgid="2535716629358298691">"Hlasový rozhovor"</string>
@@ -137,8 +130,15 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Použiť túto fotografiu"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nemožno upraviť pomocou tejto aplikácie."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Pri tomto kontakte nie sú uvedené žiadne ďalšie informácie."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nie je možné upraviť v tomto zariadení."</string>
- <string name="take_photo" msgid="7496128293167402354">"Odfotiť"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Zoradiť zoznam podľa"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Krstné meno"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Priezvisko"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Zobraziť mená kontaktov"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najskôr krstné meno"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najskôr priezvisko"</string>
+ <string name="take_photo" msgid="7496128293167402354">"Zaznamenať fotografiu"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Urobiť novú fotografiu"</string>
<string name="pick_photo" msgid="2129509985223564942">"Vybrať fotku"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"Vybrať novú fotku"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Pridať účet"</string>
<string name="add_new_account" msgid="5748627740680940264">"Pridať nový účet"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportovať súbory databázy"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Obrázok. Ak ho chcete zmeniť, vyberte ho"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"pridať nový kontakt"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Zobraziť viac"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Zobraziť menej"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Zobraziť všetko"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nedávne"</string>
- <string name="about_card_title" msgid="2920942314212825637">"O aplikácii"</string>
<string name="send_message" msgid="8938418965550543196">"Odoslať správu"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Vytvára sa osobná kópia..."</string>
<string name="yesterday" msgid="6840858548955018569">"Včera"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index afe7b3f..42c6d3a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Stiki"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Stiki"</string>
+ <string name="people" msgid="1190841469952343354">"Stiki"</string>
<string name="contactsList" msgid="8661624236494819731">"Stiki"</string>
<string name="shortcutContact" msgid="749243779392912958">"Vizitka"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Bližnjice za klicanje"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Izberite klicno številko"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Izberi številko za pošiljanje sporočila"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izbira stika"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ustvarite nov stik"</string>
<string name="starredList" msgid="4817256136413959463">"Z zvezdico"</string>
<string name="frequentList" msgid="7154768136473953056">"Pogosto"</string>
<string name="strequentList" msgid="5640192862059373511">"Priljubljene"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Ogled stika"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Dodaj k priljubljenim"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Odstrani iz priljubljenih"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Odstranjeno iz priljubljenih"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Dodano med priljubljene"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Uredi"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Postavi na začetni zaslon"</string>
@@ -117,13 +113,10 @@
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> od <xliff:g id="TOTAL_NUMBER">%s</xliff:g> stikov"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Imena stikov"</string>
- <string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikacije za obravnavo tega dejanja ni mogoče najti."</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"Programa za obravnavo tega dejanja ni mogoče najti."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknite za vrnitev na prejšnji zaslon"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Dodaj telefonsko številko"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Dodaj e-poštni naslov"</string>
<string name="missing_app" msgid="1466111003546611387">"Za to dejanje ni mogoče najti nobene aplikacije."</string>
<string name="menu_share" msgid="943789700636542260">"Skupna raba"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Dodaj med stike"</string>
<string name="share_via" msgid="563121028023030093">"Deli stik z drugimi prek"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Ustvari skupino v računu"</string>
<string name="audio_chat" msgid="2535716629358298691">"Glasovni klepet"</string>
@@ -136,8 +129,15 @@
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Uporabi to fotografijo"</string>
- <string name="contact_read_only" msgid="7421346527289472273">"S to aplikacijo urejanje ni mogoče."</string>
+ <string name="contact_read_only" msgid="7421346527289472273">"S tem programom urejanje ni mogoče."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Za ta stik ni nobenih drugih podatkov"</string>
<string name="group_read_only" msgid="1061762906115697637">"V tej napravi ni mogoče urejati skupine."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Razvrsti seznam po"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ime"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Priimek"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Prikaži imena stikov"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprej ime"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprej priimek"</string>
<string name="take_photo" msgid="7496128293167402354">"Posnemi fotografijo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Posnemi novo fotografijo"</string>
<string name="pick_photo" msgid="2129509985223564942">"Izberite fotografijo"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Dodaj račun"</string>
<string name="add_new_account" msgid="5748627740680940264">"Dodaj nov račun"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Izvoz datotek zbirke"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Slika. Izberite, da spremenite"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"dodaj novi stik"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Pokaži več"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Pokaži manj"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Pokaži vse"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Stik"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Nedavno"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Vizitka"</string>
<string name="send_message" msgid="8938418965550543196">"Pošlji sporočilo"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Ustvarjanje osebne kopije ..."</string>
<string name="yesterday" msgid="6840858548955018569">"Včeraj"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c17ab6d..690e0b5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контакти"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контакти"</string>
+ <string name="people" msgid="1190841469952343354">"Контакти"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакти"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Директно бирање"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Одаберите број за позив"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Одаберите број за слање порука"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Изаберите контакт"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Направи нови контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Са звездицом"</string>
<string name="frequentList" msgid="7154768136473953056">"Чести"</string>
<string name="strequentList" msgid="5640192862059373511">"Омиљено"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Прикажи контакт"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Додај у омиљене контакте"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Уклони из омиљених контаката"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Уклоњено је из Омиљеног"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Додато је у Омиљено"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Измени"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Избриши"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Постави на Почетни екран"</string>
@@ -79,7 +75,7 @@
</string-array>
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Слике нису доступне на таблету."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"На телефону нема доступних слика."</string>
- <string name="attach_photo_dialog_title" msgid="5599827035558557169">"Слика контакта"</string>
+ <string name="attach_photo_dialog_title" msgid="5599827035558557169">"Фотографија контакта"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Назив прилагођене ознаке"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Шаљи позиве директно у гласовну пошту"</string>
<string name="removePhoto" msgid="4898105274130284565">"Уклони фотографију"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Имена контаката"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Није пронађена ниједна апликација која би могла да изврши ову радњу."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликните да бисте се вратили на претходни екран"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Додајте број телефона"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Додајте имејл"</string>
<string name="missing_app" msgid="1466111003546611387">"Није пронађена ниједна апликација која би могла да обави ову радњу."</string>
<string name="menu_share" msgid="943789700636542260">"Дели"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Додај у контакте"</string>
<string name="share_via" msgid="563121028023030093">"Дели контакт преко"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Прављење групе на налогу"</string>
<string name="audio_chat" msgid="2535716629358298691">"Аудио ћаскање"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Користи ову фотографију"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Не може да се измени из ове апликације."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Нема додатних информацијa за овај контакт."</string>
<string name="group_read_only" msgid="1061762906115697637">"Не може да се мења на овом уређају."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Сортирај листу према"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Име"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Презиме"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Прикажи имена контаката"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Најпре име"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Прво презиме"</string>
<string name="take_photo" msgid="7496128293167402354">"Сними фотографију"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Направи нову фотографију"</string>
<string name="pick_photo" msgid="2129509985223564942">"Изаберите слику"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Додај налог"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додај нови налог"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Извези датотеке базе података"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Слика. Додирните да бисте променили"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"додавање новог контакта"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Прикажи више"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Прикажи мање"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Прикажи све"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Недавно"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Основни подаци"</string>
<string name="send_message" msgid="8938418965550543196">"Пошаљи поруку"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Прављење личне копије..."</string>
<string name="yesterday" msgid="6840858548955018569">"Јуче"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f05e255..050f1aa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontakter"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontakter"</string>
+ <string name="people" msgid="1190841469952343354">"Kontakter"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontakter"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direktval"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Välj ett nummer som du vill ringa"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Välj ett nummer för meddelandet"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Välj en kontakt"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Skapa ny kontakt"</string>
<string name="starredList" msgid="4817256136413959463">"Stjärnmärkta"</string>
<string name="frequentList" msgid="7154768136473953056">"Ofta"</string>
<string name="strequentList" msgid="5640192862059373511">"Favoriter"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Visa kontakt"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Lägg till i Favoriter"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Ta bort från Favoriter"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Borttagen från favoriter"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Har lagts till i Favoriter"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Redigera"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Ta bort"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Placera på startskärmen"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Dina kontakters namn"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ingen app som kan hantera åtgärden hittades."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klicka om du vill återvända till föregående skärm"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Lägg till telefonnummer"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Lägg till e-post"</string>
<string name="missing_app" msgid="1466111003546611387">"Ingen app som kan hantera åtgärden hittades"</string>
<string name="menu_share" msgid="943789700636542260">"Dela"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Lägg till i Kontakter"</string>
<string name="share_via" msgid="563121028023030093">"Dela kontakt via"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Skapa grupp under konto"</string>
<string name="audio_chat" msgid="2535716629358298691">"Röstchatt"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Använd det här fotot"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Kan inte redigeras från den här appen."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Det finns ingen mer information för kontakten."</string>
<string name="group_read_only" msgid="1061762906115697637">"Kan inte redigeras i den här enheten."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortera lista efter"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Förnamn"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Efternamn"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Visa kontaktnamn"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Förnamn först"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternamn först"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta en bild"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ta ny bild"</string>
<string name="pick_photo" msgid="2129509985223564942">"Välj foto"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Lägg till ett konto"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lägg till ett nytt konto"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Exportera databasfiler"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Bild. Välj om du vill ändra"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"lägg till ny kontakt"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Visa mer"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Visa mindre"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Visa alla"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Senaste"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Om"</string>
<string name="send_message" msgid="8938418965550543196">"Skicka meddelande"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Skapar en personlig kopia ..."</string>
<string name="yesterday" msgid="6840858548955018569">"I går"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d68adcb..31cd350 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Anwani"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Anwani"</string>
+ <string name="people" msgid="1190841469952343354">"Anwani"</string>
<string name="contactsList" msgid="8661624236494819731">"Anwani"</string>
<string name="shortcutContact" msgid="749243779392912958">"Anwani"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Upigaji wa moja kwa moja"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Chagua nambari ya kupiga"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Chagua nambari ya kutumia ujumbe"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Chagua mwasiliani"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Ongeza anwani mpya"</string>
<string name="starredList" msgid="4817256136413959463">"Zenye nyota"</string>
<string name="frequentList" msgid="7154768136473953056">"Mara kwa mara"</string>
<string name="strequentList" msgid="5640192862059373511">"Vipendwa"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Tazama anwani"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Ongeza kwa vipendwa"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Ondoa kwenye vipendwa"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Imeondolowa kwenye vipendewa"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Imeongezwa kwenye vipendwa"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Badilisha"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Futa"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Weka kwenye skrini ya Mwanzo"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Majina ya anwani zako"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Bofya ili urudi kwenye skrini iliyotangulia"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Ongeza nambari ya simu"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Ongeza anwani ya barua pepe"</string>
<string name="missing_app" msgid="1466111003546611387">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
<string name="menu_share" msgid="943789700636542260">"Shiriki"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Ongeza kwenye anwani"</string>
<string name="share_via" msgid="563121028023030093">"Shiriki anwani kupitia"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Buni kikundi chini ya akaunti"</string>
<string name="audio_chat" msgid="2535716629358298691">"Gumzo la sauti"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Tumia picha hii"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Haiwezi kuhaririwa kutoka kwa programu hii."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Hakuna maelezo ya ziada ya mwasiliani huyu."</string>
<string name="group_read_only" msgid="1061762906115697637">"Haiwezi kuhaririwa kwenye kifaa hiki"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Panga orodha kwa"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Jina la kwanza"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Jila la familia"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Angalia majina ya anwani"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Jina ulilopewa kwanza"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Jina la familia kwanza"</string>
<string name="take_photo" msgid="7496128293167402354">"Piga picha"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Piga picha mpya"</string>
<string name="pick_photo" msgid="2129509985223564942">"Chagua picha"</string>
@@ -213,7 +213,7 @@
<string name="local_profile_title" msgid="2021416826991393684">"Wasifu wangu wa ndani."</string>
<string name="external_profile_title" msgid="8034998767621359438">"Wasifu wangu wa <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
<string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Inaonyesha anwani zote"</string>
- <string name="no_account_prompt" msgid="6424883302325061025">"Anwani hufanya kazi vizuri zaidi ukiwa na Akaunti ya Google. \n \n • Zifikie ukitumia kivinjari chochote. \n • Hifadhi nakala za anwani zako kwa usalama."</string>
+ <string name="no_account_prompt" msgid="6424883302325061025">"Anwani hufanya kazi vizuri pamoja na Akaunti ya Google. \n \n • Zifikie kwa kutumia kivinjari chochote. \n • Hifadhi nakala rudufu ya anwani zako kwa usalama."</string>
<string name="generic_no_account_prompt" msgid="7218827704367325460">"Weka anwani za unaowasiliana nao salama hata ukipoteza simu yako: sawazisha kwa huduma iliyo mtandaoni."</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"Ongeza akaunti"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Anwani yako mpya haitakuwa na nakala rudufu. Je, ungependa kuongeza akaunti ambayo inahifadhi nakala rudufu ya anwani katika mtandao?"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Ongeza akaunti"</string>
<string name="add_new_account" msgid="5748627740680940264">"Ongeza akaunti mpya"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Hamisha faili za hifadhidata"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Picha. Chagua ili ubadilishe"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"ongeza anwani mpya"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Angalia zaidi"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Angalia chache"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Angalia zote"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Anwani"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Hivi majuzi"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Kuhusu"</string>
<string name="send_message" msgid="8938418965550543196">"Tuma ujumbe"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Inaunda nakala binafsi..."</string>
<string name="yesterday" msgid="6840858548955018569">"Jana"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 2c542ba..1af9d75 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -15,8 +15,6 @@
-->
<resources>
<dimen name="editor_padding_top">32dip</dimen>
- <dimen name="editor_round_button_padding_left">16dip</dimen>
- <dimen name="editor_round_button_padding_right">16dip</dimen>
<dimen name="editor_type_label_width">122dip</dimen>
<dimen name="editor_add_field_label_left_padding">16dip</dimen>
<dimen name="detail_item_vertical_margin">16dip</dimen>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index b59e9e0..2ef692f 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"தொடர்புகள்"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"தொடர்புகள்"</string>
+ <string name="people" msgid="1190841469952343354">"தொடர்புகள்"</string>
<string name="contactsList" msgid="8661624236494819731">"தொடர்புகள்"</string>
<string name="shortcutContact" msgid="749243779392912958">"தொடர்பு"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"நேரடி டயல்"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"அழைப்பதற்கான எண்ணைத் தேர்வுசெய்யவும்"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"செய்தி அனுப்ப எண்ணைத் தேர்வுசெய்க"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"தொடர்பைத் தேர்வுசெய்யவும்"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"புதிய தொடர்பை உருவாக்கவும்"</string>
<string name="starredList" msgid="4817256136413959463">"நட்சத்திரமிட்டது"</string>
<string name="frequentList" msgid="7154768136473953056">"அடிக்கடி"</string>
<string name="strequentList" msgid="5640192862059373511">"பிடித்தவை"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"தொடர்பைக் காட்டு"</string>
<string name="menu_addStar" msgid="2908478235715404876">"பிடித்தவற்றில் சேர்"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"பிடித்தவற்றிலிருந்து அகற்று"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"விருப்பங்களிலிருந்து அகற்றப்பட்டது"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"விருப்பங்களில் சேர்க்கப்பட்டது"</string>
<string name="menu_editContact" msgid="9042415603857662633">"திருத்து"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"நீக்கு"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"முகப்புத் திரையில் அமை"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"உங்கள் தொடர்புகளின் பெயர்கள்"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவுமில்லை."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"முந்தைய திரைக்குச் செல்ல கிளிக் செய்க"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ஃபோன் எண்ணைச் சேர்க்கவும்"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"மின்னஞ்சலைச் சேர்க்கவும்"</string>
<string name="missing_app" msgid="1466111003546611387">"இந்தச் செயலைச் செய்ய பயன்பாடு எதுவுமில்லை."</string>
<string name="menu_share" msgid="943789700636542260">"பகிர்"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"தொடர்புகளில் சேர்"</string>
<string name="share_via" msgid="563121028023030093">"இதன் வழியாக தொடர்பைப் பகிர்"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"கணக்கின் கீழ் குழுவை உருவாக்கவும்"</string>
<string name="audio_chat" msgid="2535716629358298691">"குரல் அரட்டை"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"இந்தப் படத்தைப் பயன்படுத்து"</string>
<string name="contact_read_only" msgid="7421346527289472273">"இந்தப் பயன்பாட்டிலிருந்து திருத்த முடியாது."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"இந்தத் தொடர்புக்குக் கூடுதல் தகவல் இல்லை."</string>
<string name="group_read_only" msgid="1061762906115697637">"இந்தச் சாதனத்தில் திருத்தக்கூடியதல்ல."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"பட்டியலை இதன்படி அமை"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"வழங்கப்படும் பெயர்"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"குடும்பப் பெயர்"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"தொடர்பு பெயர்களைக் காட்டு"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"முதலில் வழங்கப்படும் பெயர்"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"முதலில் குடும்பப் பெயர்"</string>
<string name="take_photo" msgid="7496128293167402354">"படமெடு"</string>
<string name="take_new_photo" msgid="7341354729436576304">"புதிய படத்தை எடு"</string>
<string name="pick_photo" msgid="2129509985223564942">"படத்தைத் தேர்வுசெய்யவும்"</string>
@@ -169,8 +169,8 @@
<string name="add_to_my_contacts" msgid="1068274916793627723">"எனது தொடர்புகளில் சேர்"</string>
<string name="contact_directory_description" msgid="683398073603909119">"கோப்பகம் <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="list_filter_custom" msgid="8910173055702057002">"தனிப்பயன்"</string>
- <string name="activity_title_settings" msgid="5464130076132770781">"அமைப்பு"</string>
- <string name="menu_settings" msgid="377929915873428211">"அமைப்பு"</string>
+ <string name="activity_title_settings" msgid="5464130076132770781">"அமைப்புகள்"</string>
+ <string name="menu_settings" msgid="377929915873428211">"அமைப்புகள்"</string>
<string name="menu_help" msgid="5123887102216637725">"உதவி"</string>
<string name="preference_displayOptions" msgid="1341720270148252393">"திரை விருப்பங்கள்"</string>
<string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
@@ -216,21 +216,22 @@
<string name="no_account_prompt" msgid="6424883302325061025">"Google கணக்குடன் தொடர்புகள் அம்சம் சிறந்த முறையில் வேலை செய்கிறது.\n\n• எந்த இணைய உலாவியிலிருந்தும் அணுகலாம்.\n• தொடர்புகளைப் பாதுகாப்பாகக் காப்புப்பிரதி எடுக்கலாம்."</string>
<string name="generic_no_account_prompt" msgid="7218827704367325460">"மொபைலை தொலைத்தாலும் தொடர்புகளைப் பாதுகாப்புடன் வைத்திருக்கலாம்: ஆன்லைன் சேவையுடன் ஒத்திசைக்கவும்."</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"கணக்கைச் சேர்"</string>
- <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"புதிய தொடர்பை நகலெடுக்க முடியாது. தொடர்புகளை ஆன்லைனில் சேமிக்க, கணக்கைச் சேர்க்க விரும்புகிறீர்களா?"</string>
+ <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"புதிய தொடர்பைக் காப்புப் பிரதியெடுக்க முடியாது. தொடர்புகளை ஆன்லைனில் காப்புப் பிரதியெடுக்கும் கணக்கைச் சேர்க்கவா?"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"புதிய தொடர்பு <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> உடன் ஒத்திசைக்கப்படும்."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"புதிய தொடர்பை பின்வரும் கணக்குகள் ஒன்றுடன் ஒத்திசைக்கலாம். எதைப் பயன்படுத்த விரும்புகிறீர்கள்?"</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"புதிய தொடர்பைச் சேர்"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"தொடர்பைத் திருத்து"</string>
- <string name="keep_local" msgid="1258761699192993322">"ஃபோனில் சேமி"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"தொடர்பை மாற்று"</string>
+ <string name="keep_local" msgid="1258761699192993322">"அகத்திலேயே சேமி"</string>
<string name="add_account" msgid="8201790677994503186">"கணக்கைச் சேர்"</string>
<string name="add_new_account" msgid="5748627740680940264">"புதிய கணக்கைச் சேர்"</string>
<string name="menu_export_database" msgid="2659719297530170820">"தரவுத்தள கோப்புகளை ஏற்றுமதி செய்"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"படம். மாற்றுவதற்குத் தேர்ந்தெடுக்கவும்"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"புதிய தொடர்பைச் சேர்"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"மேலும் காட்டு"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"குறைவாகக் காட்டு"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"எல்லாம் காட்டு"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"தொடர்பு"</string>
<string name="recent_card_title" msgid="8982782042698001695">"சமீபத்தியவை"</string>
- <string name="about_card_title" msgid="2920942314212825637">"அறிமுகம்"</string>
<string name="send_message" msgid="8938418965550543196">"செய்தி அனுப்பு"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"தனிப்பட்ட நகலை உருவாக்குகிறது..."</string>
<string name="yesterday" msgid="6840858548955018569">"நேற்று"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 3253d64..c2d7e98 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"పరిచయాలు"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"పరిచయాలు"</string>
+ <string name="people" msgid="1190841469952343354">"పరిచయాలు"</string>
<string name="contactsList" msgid="8661624236494819731">"పరిచయాలు"</string>
<string name="shortcutContact" msgid="749243779392912958">"పరిచయం"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"డైరెక్ట్ డయల్"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"కాల్ చేయాల్సిన నంబర్ను ఎంచుకోండి"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"సందేశం పంపడానికి నంబర్ను ఎంచుకోండి"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"పరిచయాన్ని ఎంచుకోండి"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"కొత్త పరిచయాన్ని సృష్టించండి"</string>
<string name="starredList" msgid="4817256136413959463">"నక్షత్రం గుర్తు ఉన్నవి"</string>
<string name="frequentList" msgid="7154768136473953056">"తరచుగా"</string>
<string name="strequentList" msgid="5640192862059373511">"ఇష్టమైనవి"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"పరిచయాన్ని వీక్షించండి"</string>
<string name="menu_addStar" msgid="2908478235715404876">"ఇష్టమైనవాటికి జోడించు"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"ఇష్టమైనవాటి నుండి తీసివేయి"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"ఇష్టమైనవి నుండి తీసివేయబడింది"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"ఇష్టమైనవికి జోడించబడింది"</string>
<string name="menu_editContact" msgid="9042415603857662633">"సవరించు"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"తొలగించు"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"హోమ్ స్క్రీన్లో ఉంచు"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"మీ పరిచయాల యొక్క పేర్లు"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ఈ చర్యను నిర్వహించడానికి అనువర్తనం ఏదీ కనుగొనబడలేదు."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"మునుపటి స్క్రీన్కి తిరిగి రావడానికి క్లిక్ చేయండి"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ఫోన్ నంబర్ను జోడించండి"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ఇమెయిల్ జోడించండి"</string>
<string name="missing_app" msgid="1466111003546611387">"ఈ చర్యను నిర్వహించడానికి అనువర్తనం ఏదీ కనుగొనబడలేదు."</string>
<string name="menu_share" msgid="943789700636542260">"భాగస్వామ్యం చేయి"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"పరిచయాలకు జోడించు"</string>
<string name="share_via" msgid="563121028023030093">"పరిచయాన్ని దీని ద్వారా భాగస్వామ్యం చేయండి"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"ఖాతాలో సమూహాన్ని సృష్టించండి"</string>
<string name="audio_chat" msgid="2535716629358298691">"వాయిస్ చాట్"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ఈ ఫోటోను ఉపయోగించు"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ఈ అనువర్తనం నుండి సవరించడం కుదరదు."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ఈ పరిచయానికి అదనపు సమాచారం లేదు."</string>
<string name="group_read_only" msgid="1061762906115697637">"ఈ పరికరంలో సవరించడం కుదరదు."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"జాబితాను ఇలా క్రమబద్ధీకరించండి"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"పెట్టిన పేరు"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"కుటుంబం పేరు"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"పరిచయ పేర్లను వీక్షించండి"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ముందుగా పెట్టిన పేరు"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ముందుగా కుటుంబం పేరు"</string>
<string name="take_photo" msgid="7496128293167402354">"ఫోటో తీసుకోండి"</string>
<string name="take_new_photo" msgid="7341354729436576304">"కొత్త ఫోటో తీసుకోండి"</string>
<string name="pick_photo" msgid="2129509985223564942">"ఫోటోను ఎంచుకోండి"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"ఖాతాను జోడించు"</string>
<string name="add_new_account" msgid="5748627740680940264">"కొత్త ఖాతాను జోడించు"</string>
<string name="menu_export_database" msgid="2659719297530170820">"డేటాబేస్ ఫైల్లను ఎగుమతి చేయి"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"చిత్రం. మార్చడానికి నొక్కండి"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"కొత్త పరిచయాన్ని జోడించు"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"మరిన్ని చూడండి"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"తక్కువ చూడండి"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"అన్నీ చూడండి"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"పరిచయం"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ఇటీవలివి"</string>
- <string name="about_card_title" msgid="2920942314212825637">"పరిచయం"</string>
<string name="send_message" msgid="8938418965550543196">"సందేశాన్ని పంపండి"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"వ్యక్తిగత కాపీని సృష్టిస్తోంది..."</string>
<string name="yesterday" msgid="6840858548955018569">"నిన్న"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d0c3c94..77d982a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"รายชื่อติดต่อ"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"รายชื่อติดต่อ"</string>
+ <string name="people" msgid="1190841469952343354">"สมุดติดต่อ"</string>
<string name="contactsList" msgid="8661624236494819731">"รายชื่อในสมุดโทรศัพท์"</string>
<string name="shortcutContact" msgid="749243779392912958">"สมุดโทรศัพท์"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"โทรโดยตรง"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"เลือกหมายเลขที่จะโทร"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"เลือกหมายเลขที่จะส่งข้อความ"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"เลือกรายชื่อติดต่อ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"สร้างรายชื่อติดต่อใหม่"</string>
<string name="starredList" msgid="4817256136413959463">"ที่ติดดาว"</string>
<string name="frequentList" msgid="7154768136473953056">"บ่อยครั้ง"</string>
<string name="strequentList" msgid="5640192862059373511">"รายการโปรด"</string>
@@ -37,20 +35,18 @@
<string name="insertGroupDescription" msgid="5658512271662210139">"สร้างกลุ่ม"</string>
<string name="contactDetailAbout" msgid="5430408883907061400">"เกี่ยวกับ"</string>
<string name="contactDetailUpdates" msgid="3780588624763446941">"อัปเดต"</string>
- <string name="searchHint" msgid="8482945356247760701">"ค้นหารายชื่อติดต่อ"</string>
+ <string name="searchHint" msgid="8482945356247760701">"ค้นหาที่อยู่ติดต่อ"</string>
<string name="menu_viewContact" msgid="2795575601596468581">"ดูสมุดโทรศัพท์"</string>
<string name="menu_addStar" msgid="2908478235715404876">"เพิ่มในรายการโปรด"</string>
- <string name="menu_removeStar" msgid="5844227078364227030">"ลบจากรายการโปรด"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"นำออกจากรายการโปรดแล้ว"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"เพิ่มลงในรายการโปรดแล้ว"</string>
+ <string name="menu_removeStar" msgid="5844227078364227030">"นำออกจากรายการโปรด"</string>
<string name="menu_editContact" msgid="9042415603857662633">"แก้ไข"</string>
- <string name="menu_deleteContact" msgid="6788644058868189393">"ลบ"</string>
+ <string name="menu_deleteContact" msgid="6788644058868189393">"นำออก"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"วางบนหน้าจอหลัก"</string>
<string name="menu_call" msgid="3992595586042260618">"โทรหารายชื่อในสมุดโทรศัพท์"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"ส่งข้อความถึงรายชื่อในสมุดโทรศัพท์"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"แยก"</string>
<string name="menu_editGroup" msgid="5062005185370983720">"แก้ไข"</string>
- <string name="menu_deleteGroup" msgid="3486380004411482874">"ลบ"</string>
+ <string name="menu_deleteGroup" msgid="3486380004411482874">"นำออก"</string>
<string name="menu_new_contact_action_bar" msgid="7263362129442119188">"เพิ่มรายชื่อผู้ติดต่อ"</string>
<string name="menu_new_group_action_bar" msgid="3520232877587377175">"เพิ่มกลุ่ม"</string>
<string name="splitConfirmation_title" msgid="633640935430370530">"แยกรายชื่อหรือไม่"</string>
@@ -64,10 +60,10 @@
<string name="contactsJoinedMessage" msgid="7208148163607047389">"รายชื่อที่รวมกัน"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"ตั้งเสียงเรียกเข้า"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"โอนทุกสายไปยังข้อความเสียง"</string>
- <string name="readOnlyContactWarning" msgid="7808825687289848259">"คุณไม่สามารถลบรายชื่อติดต่อจากบัญชีแบบอ่านอย่างเดียวได้ แต่ซ่อนไว้ในรายการรายชื่อได้"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"สมุดโทรศัพท์นี้มีข้อมูลจากหลายบัญชี ข้อมูลจากบัญชีแบบอ่านอย่างเดียวจะถูกซ่อนในรายการรายชื่อของคุณโดยไม่ถูกลบออก"</string>
- <string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"การลบสมุดโทรศัพท์นี้จะลบข้อมูลจากบัญชีแบบหลายรายการ"</string>
- <string name="deleteConfirmation" msgid="811706994761610640">"รายชื่อนี้จะถูกลบ"</string>
+ <string name="readOnlyContactWarning" msgid="7808825687289848259">"คุณไม่สามารถนำออกรายชื่อติดต่อจากบัญชีแบบอ่านอย่างเดียวได้ แต่ซ่อนไว้ในรายการรายชื่อได้"</string>
+ <string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"สมุดโทรศัพท์นี้มีข้อมูลจากหลายบัญชี ข้อมูลจากบัญชีแบบอ่านอย่างเดียวจะถูกซ่อนในรายการรายชื่อของคุณโดยไม่ถูกนำออกออก"</string>
+ <string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"การนำออกสมุดโทรศัพท์นี้จะนำออกข้อมูลจากบัญชีแบบหลายรายการ"</string>
+ <string name="deleteConfirmation" msgid="811706994761610640">"รายชื่อนี้จะถูกนำออก"</string>
<string name="menu_discard" msgid="6854657936970228164">"ยกเลิกการเปลี่ยนแปลง"</string>
<string name="invalidContactMessage" msgid="8215051456181842274">"ไม่มีรายชื่อติดต่อนี้"</string>
<string name="createContactShortcutSuccessful" msgid="7874133287558150877">"เพิ่มวิดเจ็ตสมุดโทรศัพท์ในหน้าจอหลักแล้ว"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"ชื่อของรายชื่อในสมุดโทรศัพท์ของคุณ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"คลิกเพื่อกลับไปยังหน้าจอก่อนหน้า"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"เพิ่มหมายเลขโทรศัพท์"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"เพิ่มอีเมล"</string>
<string name="missing_app" msgid="1466111003546611387">"ไม่พบแอปสำหรับการทำงานนี้"</string>
<string name="menu_share" msgid="943789700636542260">"ใช้ร่วมกัน"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"เพิ่มในสมุดติดต่อ"</string>
<string name="share_via" msgid="563121028023030093">"ใช้สมุดโทรศัพท์ร่วมกันทาง"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"สร้างกลุ่มภายในบัญชี"</string>
<string name="audio_chat" msgid="2535716629358298691">"แชทด้วยเสียง"</string>
@@ -137,13 +130,20 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ใช้ภาพนี้"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ไม่สามารถแก้ไขได้จากแอปพลิเคชันนี้"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ไม่มีข้อมูลเพิ่มเติมสำหรับรายชื่อติดต่อนี้"</string>
<string name="group_read_only" msgid="1061762906115697637">"ไม่สามารถแก้ไขได้ในอุปกรณ์นี้"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"เรียงรายการตาม"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"ชื่อ"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"นามสกุล"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"ดูชื่อที่อยู่ติดต่อ"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"ขึ้นต้นด้วยชื่อ"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"ขึ้นต้นด้วยนามสกุล"</string>
<string name="take_photo" msgid="7496128293167402354">"ถ่ายภาพ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ถ่ายภาพใหม่"</string>
<string name="pick_photo" msgid="2129509985223564942">"เลือกรูปภาพ"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"เลือกรูปภาพใหม่"</string>
- <string name="locale_change_in_progress" msgid="7583992153091537467">"กำลังอัปเดตรายการรายชื่อติดต่อตามการเปลี่ยนภาษา"</string>
- <string name="upgrade_in_progress" msgid="474511436863451061">"กำลังอัปเดตรายการรายชื่อติดต่อ"</string>
+ <string name="locale_change_in_progress" msgid="7583992153091537467">"กำลังอัปเดตรายการที่อยู่ติดต่อตามการเปลี่ยนภาษา"</string>
+ <string name="upgrade_in_progress" msgid="474511436863451061">"กำลังอัปเดตรายการที่อยู่ติดต่อ"</string>
<string name="upgrade_out_of_memory" msgid="1209994418877625940">"กำลังดำเนินการอัปเกรดสมุดโทรศัพท์\n\nกระบวนการอัปเกรดจำเป็นต้องใช้พื้นที่ประมาณ <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB ของที่จัดเก็บข้อมูลภายใน\n\nเลือกหนึ่งในตัวเลือกต่อไปนี้:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"ถอนการติดตั้งแอปพลิเคชันบางอย่าง"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"ลองอัปเกรดซ้ำ"</string>
@@ -182,7 +182,7 @@
<string name="date_year_toggle" msgid="7356532842767854606">"ระบุปี"</string>
<string name="social_widget_label" msgid="6378905543028924592">"รายชื่อติดต่อ"</string>
<string name="social_widget_loading" msgid="5327336597364074608">"กำลังโหลด..."</string>
- <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"สร้างรายชื่อติดต่อใหม่"</string>
+ <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"สร้างที่อยู่ติดต่อใหม่"</string>
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"ลงชื่อเข้าใช้บัญชี"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"นำเข้าสมุดโทรศัพท์"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"สร้างกลุ่มใหม่"</string>
@@ -191,7 +191,7 @@
<item quantity="one" msgid="2944819210288517794">"1 กลุ่ม"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> กลุ่ม"</item>
</plurals>
- <string name="delete_group_dialog_message" msgid="7586856514337560529">"ลบกลุ่ม \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" หรือไม่ (รายชื่อติดต่อจะไม่ถูกลบ)"</string>
+ <string name="delete_group_dialog_message" msgid="7586856514337560529">"นำออกกลุ่ม \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" หรือไม่ (รายชื่อติดต่อจะไม่ถูกนำออก)"</string>
<plurals name="num_contacts_in_group">
<item quantity="one" msgid="1352418549951013448">"<xliff:g id="COUNT_0">%1$d</xliff:g> คนจาก <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
<item quantity="other" msgid="8146027769011086349">"<xliff:g id="COUNT_0">%1$d</xliff:g> คนจาก <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
@@ -212,25 +212,26 @@
<string name="group_name_hint" msgid="238359485263401293">"ชื่อกลุ่ม"</string>
<string name="local_profile_title" msgid="2021416826991393684">"โปรไฟล์ในอุปกรณ์ของฉัน"</string>
<string name="external_profile_title" msgid="8034998767621359438">"โปรไฟล์ <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> ของฉัน"</string>
- <string name="toast_displaying_all_contacts" msgid="2737388783898593875">"แสดงรายชื่อติดต่อทั้งหมด"</string>
- <string name="no_account_prompt" msgid="6424883302325061025">"คุณจะใช้งานรายชื่อติดต่อได้ดีขึ้นโดยผ่านบัญชี Google\n\n• เข้าถึงได้จากเว็บเบราว์เซอร์ทุกชนิด\n• สำรองข้อมูลรายชื่อติดต่อของคุณอย่างปลอดภัย"</string>
- <string name="generic_no_account_prompt" msgid="7218827704367325460">"เก็บรายชื่อติดต่อของคุณไว้อย่างปลอดภัยด้วยการซิงค์กับบริการออนไลน์แม้ว่าคุณจะทำโทรศัพท์หาย"</string>
+ <string name="toast_displaying_all_contacts" msgid="2737388783898593875">"แสดงที่อยู่ติดต่อทั้งหมด"</string>
+ <string name="no_account_prompt" msgid="6424883302325061025">"คุณจะใช้งานที่อยู่ติดต่อได้ดีขึ้นโดยผ่านบัญชี Google\n\n• เข้าถึงได้จากเว็บเบราว์เซอร์ทุกชนิด\n• สำรองข้อมูลที่อยู่ติดต่อของคุณอย่างปลอดภัย"</string>
+ <string name="generic_no_account_prompt" msgid="7218827704367325460">"เก็บที่อยู่ติดต่อของคุณไว้อย่างปลอดภัยด้วยการซิงค์กับบริการออนไลน์แม้ว่าคุณจะทำโทรศัพท์หาย"</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"เพิ่มบัญชี"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"ผู้ติดต่อใหม่ของคุณจะไม่ได้รับการสำรองข้อมูล เพิ่มบัญชีที่สำรองข้อมูลผู้ติดต่อออนไลน์หรือไม่"</string>
<string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"ผู้ติดต่อใหม่ของคุณจะซิงค์กับ <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>"</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"คุณสามารถซิงค์ผู้ติดต่อใหม่กับบัญชีใด บัญชีหนึ่งต่อไปนี้ได้ คุณต้องการใช้บัญชีใด"</string>
- <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"เพิ่มรายชื่อติดต่อ"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"แก้ไขรายชื่อติดต่อ"</string>
+ <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"เพิ่มที่อยู่ติดต่อ"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"แก้ไขที่อยู่ติดต่อ"</string>
<string name="keep_local" msgid="1258761699192993322">"จัดเก็บในตัวเครื่อง"</string>
<string name="add_account" msgid="8201790677994503186">"เพิ่มบัญชี"</string>
<string name="add_new_account" msgid="5748627740680940264">"เพิ่มบัญชีใหม่"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ส่งออกไฟล์ฐานข้อมูล"</string>
- <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"เพิ่มรายชื่อติดต่อใหม่"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"ภาพ เลือกเพื่อเปลี่ยน"</string>
+ <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"เพิ่มที่อยู่ติดต่อใหม่"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ดูเพิ่มเติม"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"ดูน้อยลง"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"ดูทั้งหมด"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"ที่อยู่ติดต่อ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"ล่าสุด"</string>
- <string name="about_card_title" msgid="2920942314212825637">"เกี่ยวกับ"</string>
<string name="send_message" msgid="8938418965550543196">"ส่งข้อความ"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"กำลังสร้างสำเนาส่วนตัว..."</string>
<string name="yesterday" msgid="6840858548955018569">"เมื่อวานนี้"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9a7a742..e9818d0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Mga Contact"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Mga Contact"</string>
+ <string name="people" msgid="1190841469952343354">"Mga Contact"</string>
<string name="contactsList" msgid="8661624236494819731">"Mga Contact"</string>
<string name="shortcutContact" msgid="749243779392912958">"Contact"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direktang pag-dial"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Pumili ng tatawagang numero"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Pumili ng numero na padadalhan ng mensahe"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Pumili ng isang contact"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Gumawa ng bagong contact"</string>
<string name="starredList" msgid="4817256136413959463">"Naka-star"</string>
<string name="frequentList" msgid="7154768136473953056">"Madalas"</string>
<string name="strequentList" msgid="5640192862059373511">"Mga Paborito"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Tingnan ang contact"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Idagdag sa mga paborito"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Alisin mula sa mga paborito"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Inalis sa mga paborito"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Idinagdag sa mga paborito"</string>
<string name="menu_editContact" msgid="9042415603857662633">"I-edit"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Tanggalin"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Ilagay sa Home screen"</string>
@@ -107,7 +103,7 @@
<item quantity="one" msgid="4826918429708286628">"1 ang nakita"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ang nakita"</item>
</plurals>
- <string name="all_contacts_tab_label" msgid="6250372293594147703">"Lahat ng Contact"</string>
+ <string name="all_contacts_tab_label" msgid="6250372293594147703">"Lahat contact"</string>
<string name="favorites_tab_label" msgid="1524869648904016414">"Mga Paborito"</string>
<string name="callBack" msgid="5498224409038809224">"Tumawag pabalik"</string>
<string name="callAgain" msgid="3197312117049874778">"Tawagan muli"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Mga pangalan ng iyong mga contact"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Walang natagpuang app na mangangasiwa sa pagkilos na ito."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"I-click upang bumalik sa nakaraang screen"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Magdagdag ng numero ng telepono"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Magdagdag ng email"</string>
<string name="missing_app" msgid="1466111003546611387">"Walang nakitang app na gagawa sa aksyong ito."</string>
<string name="menu_share" msgid="943789700636542260">"Ibahagi"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Idagdag sa mga contact"</string>
<string name="share_via" msgid="563121028023030093">"Ibahagi ang contact sa pamamagitan ng"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Lumikha ng pangkat sa ilalim ng account"</string>
<string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Gamitin ang larawang ito"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Hindi maaaring i-edit mula sa app na ito."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Walang karagdagang impormasyon para sa contact na ito."</string>
<string name="group_read_only" msgid="1061762906115697637">"Hindi maaaring i-edit sa device na ito."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Pag-uri-uriin ang listahan ayon sa"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Pangalan"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Apelyido"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Tingnan ang mga pangalan ng contact"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pangalan muna"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelyido muna"</string>
<string name="take_photo" msgid="7496128293167402354">"Kumuha ng larawan"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Kumuha ng bagong larawan"</string>
<string name="pick_photo" msgid="2129509985223564942">"Pumili ng larawan"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Magdagdag ng account"</string>
<string name="add_new_account" msgid="5748627740680940264">"Magdagdag ng bagong account"</string>
<string name="menu_export_database" msgid="2659719297530170820">"I-export ang mga file ng database"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Larawan. Piliin upang palitan"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"magdagdag ng bagong contact"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Tumingin nang higit pa"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Tumingin nang mas kaunti"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Tingnan lahat"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Contact"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Kamakailan"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Tungkol dito"</string>
<string name="send_message" msgid="8938418965550543196">"Magpadala ng mensahe"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Gumagawa ng personal na kopya..."</string>
<string name="yesterday" msgid="6840858548955018569">"Kahapon"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3c6e44c..2b302c8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kişiler"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kişiler"</string>
+ <string name="people" msgid="1190841469952343354">"Kişiler"</string>
<string name="contactsList" msgid="8661624236494819731">"Kişiler"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kişi"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Doğrudan çevirme"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Aranacak numarayı seçin"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"İleti gönderilecek bir numara seçin"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Bir kişi seçin"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Yeni kişi oluştur"</string>
<string name="starredList" msgid="4817256136413959463">"Yıldızlı"</string>
<string name="frequentList" msgid="7154768136473953056">"Sık sık"</string>
<string name="strequentList" msgid="5640192862059373511">"Sık Kullanılanlar"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Kişiyi görüntüle"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Sık kullanılanlara ekle"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Sık kullanılanlardan kaldır"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Favorilerden kaldırıldı"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Favorilere eklendi"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Düzenle"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Sil"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Ana ekrana yerleştir"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kişilerinizin adları"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Bu işlemi gerçekleştirecek uygulama bulunamadı."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Önceki ekrana dönmek için tıklayın"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefon numarası ekle"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"E-posta adresi ekle"</string>
<string name="missing_app" msgid="1466111003546611387">"Bu işlemi gerçekleştirecek uygulama bulunamadı."</string>
<string name="menu_share" msgid="943789700636542260">"Paylaş"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Kişilere ekle"</string>
<string name="share_via" msgid="563121028023030093">"Şunu kullanarak kişi paylaş:"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Grubu şu hesabın altında oluştur:"</string>
<string name="audio_chat" msgid="2535716629358298691">"Sesli sohbet"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Bu fotoğrafı kullan"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Bu uygulamadan düzenlenemez."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Bu kişi için ek bilgi yok."</string>
<string name="group_read_only" msgid="1061762906115697637">"Bu cihazda düzenlenemez."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Listeyi şu ölçüte göre sırala:"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Adı"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Soyadı"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Kişi adlarını görüntüle"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Önce adı"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Önce soyadı"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotoğraf çek"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Yeni fotoğraf çek"</string>
<string name="pick_photo" msgid="2129509985223564942">"Fotoğraf seç"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Hesap ekle"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yeni hesap ekle"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Veritabanı dosyalarını dışarı aktar"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Resim. Değiştirmek için seçin"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"yeni kişi ekle"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Daha fazla göster"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Daha az göster"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Tümünü göster"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kişi"</string>
<string name="recent_card_title" msgid="8982782042698001695">"En son"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Hakkında"</string>
<string name="send_message" msgid="8938418965550543196">"İleti gönder"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Kişisel kopya oluşturuluyor..."</string>
<string name="yesterday" msgid="6840858548955018569">"Dün"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ca9f6be..dd6856d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Контакти"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Контакти"</string>
+ <string name="people" msgid="1190841469952343354">"Контакти"</string>
<string name="contactsList" msgid="8661624236494819731">"Контакти"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Прямий набір"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Вибір номера для виклику"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Вибір номера для надс. повід."</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Вибрати контакт"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Створити новий контакт"</string>
<string name="starredList" msgid="4817256136413959463">"Із зіроч."</string>
<string name="frequentList" msgid="7154768136473953056">"Найчастіші"</string>
<string name="strequentList" msgid="5640192862059373511">"Вибране"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Див. контакт"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Додати до вибраного"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Видалити з вибраного"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Видалено з вибраного"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Додано до вибраного"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Редагувати"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Видалити"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Місце на головному екрані"</string>
@@ -55,14 +51,14 @@
<string name="menu_new_group_action_bar" msgid="3520232877587377175">"Додати групу"</string>
<string name="splitConfirmation_title" msgid="633640935430370530">"Розділити контакт?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Цей контакт буде розділено на декілька контактів."</string>
- <string name="menu_joinAggregate" msgid="5027981918265667970">"Об’єднати"</string>
+ <string name="menu_joinAggregate" msgid="5027981918265667970">"Приєдн."</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Об\'єдн. контакти"</string>
<string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Виберіть контакт, який треба об’єднати з <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Показ. всі контакти"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Пропоновані контакти"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Усі контакти"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"Контакти об\'єднано"</string>
- <string name="menu_set_ring_tone" msgid="8728345772068064946">"Мелодія"</string>
+ <string name="menu_set_ring_tone" msgid="8728345772068064946">"Установ.мелодію"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Усі виклики на голосову пошту"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Неможливо видалити контакти з облікових записів \"лише для читання\", але можна сховати їх у списках контактів."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Цей контакт містить інфор-цію з декількох обл. записів. Інф-цію із записів лише для читання буде сховано у ваших списках контактів, а не видалено."</string>
@@ -80,7 +76,7 @@
<string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"У пристрої немає доступних зображень."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"У телефоні немає доступних зображень."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Фото контакта"</string>
- <string name="customLabelPickerTitle" msgid="1081475101983255212">"Назва"</string>
+ <string name="customLabelPickerTitle" msgid="1081475101983255212">"Назва спец. мітки"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Надсилати дзвінки на голос. пошту"</string>
<string name="removePhoto" msgid="4898105274130284565">"Видалити фото"</string>
<string name="noContacts" msgid="8579310973261953559">"Немає контакт."</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Імена ваших контактів"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не знайдено програму для обробки цієї дії."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Натисніть, щоб повернутися на попередній екран"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Додайте номер телефону"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Додайте електронну адресу"</string>
<string name="missing_app" msgid="1466111003546611387">"Не знайдено програму для обробки цієї дії."</string>
<string name="menu_share" msgid="943789700636542260">"Надісл."</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Додати в контакти"</string>
<string name="share_via" msgid="563121028023030093">"Надісл. контакт через"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Створити групу в обліковому записі"</string>
<string name="audio_chat" msgid="2535716629358298691">"Голосовий чат"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Викор. це фото"</string>
<string name="contact_read_only" msgid="7421346527289472273">"З цієї програми неможливо редагувати."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Немає додаткової інформації для цього контакта."</string>
<string name="group_read_only" msgid="1061762906115697637">"Неможливо редагувати на цьому пристрої"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Сорт. список за"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ім\'я"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Прізвище"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Переглянути імена контактів"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Спочатку ім\'я"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Спочатку прізвище"</string>
<string name="take_photo" msgid="7496128293167402354">"Зробити фото"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Зробити нове фото"</string>
<string name="pick_photo" msgid="2129509985223564942">"Вибрати фото"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Додати обліковий запис"</string>
<string name="add_new_account" msgid="5748627740680940264">"Додати новий обліковий запис"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Експортувати файли бази даних"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Зображення. Виберіть, щоб змінити"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"додати нового контакта"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Показати більше"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Показати менше"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Показати все"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Контакт"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Остання підказка"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Інформація"</string>
<string name="send_message" msgid="8938418965550543196">"Надіслати повідомлення"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Створення особистої копії…"</string>
<string name="yesterday" msgid="6840858548955018569">"Учора"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index c868fd9..5774753 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"رابطے"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"رابطے"</string>
+ <string name="people" msgid="1190841469952343354">"رابطے"</string>
<string name="contactsList" msgid="8661624236494819731">"رابطے"</string>
<string name="shortcutContact" msgid="749243779392912958">"رابطہ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"ڈائریکٹ ڈائل"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"کال کرنے کیلئے ایک نمبر منتخب کریں"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"پیغام بھیجنے کیلئے ایک نمبر منتخب کریں"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"ایک رابطہ منتخب کریں"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"نیا رابطہ بنائیں"</string>
<string name="starredList" msgid="4817256136413959463">"ستارے کے نشان والے"</string>
<string name="frequentList" msgid="7154768136473953056">"اکثر"</string>
<string name="strequentList" msgid="5640192862059373511">"پسندیدہ"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"رابطہ دیکھیں"</string>
<string name="menu_addStar" msgid="2908478235715404876">"پسندیدہ میں شامل کریں"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"پسندیدہ سے ہٹائیں"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"پسندیدہ سے ہٹا دیا گیا"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"پسندیدہ میں شامل کر دیا گیا"</string>
<string name="menu_editContact" msgid="9042415603857662633">"ترمیم کریں"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"حذف کریں"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"ہوم اسکرین پر رکھیں"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"آپ کے رابطوں کے نام"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"اس کارروائی کو نمٹانے کیلئے کوئی ایپ نہیں ملا۔"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"سابقہ اسکرین پر واپس جانے کیلئے کلک کریں"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"فون نمبر شامل کریں"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"ای میل شامل کریں"</string>
<string name="missing_app" msgid="1466111003546611387">"اس کارروائی کو نمٹانے کیلئے کوئی ایپ نہیں ملا۔"</string>
<string name="menu_share" msgid="943789700636542260">"اشتراک کریں"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"رابطوں میں شامل کریں"</string>
<string name="share_via" msgid="563121028023030093">"رابطہ کا اشتراک کریں معرفت"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"اکاؤنٹ کے تحت گروپ بنائیں"</string>
<string name="audio_chat" msgid="2535716629358298691">"صوتی چیٹ"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"یہ تصویر استعمال کریں"</string>
<string name="contact_read_only" msgid="7421346527289472273">"اس ایپ سے قابل ترمیم نہیں ہے۔"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"اس رابطہ کیلئے کوئی اضافی معلومات نہیں ہے۔"</string>
<string name="group_read_only" msgid="1061762906115697637">"اس آلہ پر قابل ترمیم نہیں ہے۔"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"فہرست ترتیب دیں بہ لحاظ"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"رکھا گیا نام"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"خاندانی نام"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"رابطوں کے نام دیکھیں"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"رکھا گیا نام پہلے"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"خاندانی نام پہلے"</string>
<string name="take_photo" msgid="7496128293167402354">"تصویر لیں"</string>
<string name="take_new_photo" msgid="7341354729436576304">"نئی تصویر لیں"</string>
<string name="pick_photo" msgid="2129509985223564942">"تصویر منتخب کریں"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"اکاؤنٹ شامل کریں"</string>
<string name="add_new_account" msgid="5748627740680940264">"نیا اکاؤنٹ شامل کریں"</string>
<string name="menu_export_database" msgid="2659719297530170820">"ڈیٹا بیس فائلیں برآمد کریں"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"تصویر۔ تبدیل کرنے کیلئے منتخب کریں"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"نیا رابطہ شامل کریں"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"مزید دیکھیں"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"کم دیکھیں"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"سبھی دیکھیں"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"رابطہ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"حالیہ"</string>
- <string name="about_card_title" msgid="2920942314212825637">"تفصیل"</string>
<string name="send_message" msgid="8938418965550543196">"پیغام بھیجیں"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"ایک ذاتی کاپی بنائی جا رہی ہے…"</string>
<string name="yesterday" msgid="6840858548955018569">"گزشتہ کل"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 1c456d1..4a2e74a 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Kontaktlar"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Kontaktlar"</string>
+ <string name="people" msgid="1190841469952343354">"Kontaktlar"</string>
<string name="contactsList" msgid="8661624236494819731">"Kontaktlar"</string>
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Tez terish"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Qo‘ng‘iroq qilish uchun raqamni tanlang"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Xabar yozish uchun raqamni tanlang"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Kontaktni tanlang"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Yangi kontakt yaratish"</string>
<string name="starredList" msgid="4817256136413959463">"Baho berilgan"</string>
<string name="frequentList" msgid="7154768136473953056">"Ko‘p gaplashilgan"</string>
<string name="strequentList" msgid="5640192862059373511">"Saralar"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Kontaktni ko‘rish"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Saralarga qo‘shish"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Saralardan olib tashlash"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Sevimlilardan o‘chirib tashlandi"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Sevimlilarga qo‘shildi"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Tahrirlash"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"O‘chirish"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Uy ekraniga joylashtirish"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktlaringiz nomi"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ushbu amalni bajarish uchun ilova topilmadi."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Avvalgi ekranga qaytish uchun bosing"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefon raqamini qo\'shish"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Elektron pochta qo\'shish"</string>
<string name="missing_app" msgid="1466111003546611387">"Ushbu amalni bajarish uchun ilova topilmadi."</string>
<string name="menu_share" msgid="943789700636542260">"Ulashish"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Kontaktlarga qo‘shish"</string>
<string name="share_via" msgid="563121028023030093">"Kontakni bu orqali ulashish:"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Hisob ostida guruh yaratish"</string>
<string name="audio_chat" msgid="2535716629358298691">"Ovozli suhbat"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Ushbu suratdan foydalaning"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ushbu ilova orqali tahrirlab bo‘lmaydi."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Ushbu kontakt uchun qo‘shimcha ma’lumot yo‘q."</string>
<string name="group_read_only" msgid="1061762906115697637">"Ushbu qurilmada tahrir qilib bo‘lmaydi."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Ro‘yxatni quyidagicha saralash"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Ismi"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sharifi"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Kontakt nomlarini ko‘rish"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Ismi birinchi"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sharifi birinchi"</string>
<string name="take_photo" msgid="7496128293167402354">"Suratga olish"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Yangi surat olish"</string>
<string name="pick_photo" msgid="2129509985223564942">"Surat tanlang"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Hisob qo‘shish"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yangi hisob qo‘shish"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Ma’lumotlar bazasi fayllarini eksport qilish"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Rasm. O‘zgartirish uchun tanlang"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"yangi kontakt qo‘shish"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Ko‘proq"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kamroq"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Barchasini ko‘rish"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Kontakt"</string>
<string name="recent_card_title" msgid="8982782042698001695">"So‘nggi"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Ma’lumot"</string>
<string name="send_message" msgid="8938418965550543196">"Xabar yuborish"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Shaxsiy nusxasi yaratilmoqda…"</string>
<string name="yesterday" msgid="6840858548955018569">"Kecha"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea2833e..b9903fe 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Danh bạ"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Danh bạ"</string>
+ <string name="people" msgid="1190841469952343354">"Danh bạ"</string>
<string name="contactsList" msgid="8661624236494819731">"Danh bạ"</string>
<string name="shortcutContact" msgid="749243779392912958">"Liên hệ"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Quay số trực tiếp"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Chọn một số để gọi"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Chọn một số để gửi tin nhắn"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Chọn địa chỉ liên hệ"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Tạo liên hệ mới"</string>
<string name="starredList" msgid="4817256136413959463">"Được gắn dấu sao"</string>
<string name="frequentList" msgid="7154768136473953056">"Thường xuyên"</string>
<string name="strequentList" msgid="5640192862059373511">"Mục ưa thích"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Xem liên hệ"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Thêm vào mục ưa thích"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Xóa khỏi mục ưa thích"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Đã xóa khỏi mục ưa thích"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Đã thêm vào mục ưa thích"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Chỉnh sửa"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Xóa"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Đặt trên màn hình chính"</string>
@@ -53,7 +49,7 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Xóa"</string>
<string name="menu_new_contact_action_bar" msgid="7263362129442119188">"Thêm địa chỉ liên hệ"</string>
<string name="menu_new_group_action_bar" msgid="3520232877587377175">"Thêm nhóm"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Tách địa chỉ liên hệ?"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Tách đ.chỉ liên hệ?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Địa chỉ liên hệ này sẽ được tách thành nhiều địa chỉ liên hệ."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Kết hợp"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Kết hợp danh bạ"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Tên danh bạ của bạn"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Không tìm thấy ứng dụng nào để xử lý tác vụ này."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Nhấp để quay lại màn hình trước đó"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Thêm số điện thoại"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Thêm email"</string>
<string name="missing_app" msgid="1466111003546611387">"Không tìm thấy ứng dụng nào để xử lý tác vụ này."</string>
<string name="menu_share" msgid="943789700636542260">"Chia sẻ"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Thêm vào danh bạ"</string>
<string name="share_via" msgid="563121028023030093">"Chia sẻ liên hệ qua"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Tạo nhóm trong tài khoản"</string>
<string name="audio_chat" msgid="2535716629358298691">"Trò chuyện thoại"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Sử dụng ảnh này"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Không chỉnh sửa được từ ứng dụng này."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Không có thông tin bổ sung nào cho địa chỉ liên hệ này."</string>
<string name="group_read_only" msgid="1061762906115697637">"Không chỉnh sửa được trên thiết bị này."</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Sắp xếp danh sách theo"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Tên"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Họ"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Xem tên liên hệ"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Tên trước tiên"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Họ trước tiên"</string>
<string name="take_photo" msgid="7496128293167402354">"Chụp ảnh"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Chụp ảnh mới"</string>
<string name="pick_photo" msgid="2129509985223564942">"Chọn ảnh"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Thêm tài khoản"</string>
<string name="add_new_account" msgid="5748627740680940264">"Thêm tài khoản mới"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Xuất các tệp cơ sở dữ liệu"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Ảnh. Chọn để thay đổi"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"thêm liên hệ mới"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Xem thêm"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Xem bớt"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Xem tất cả"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Liên hệ"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Gần đây"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Giới thiệu"</string>
<string name="send_message" msgid="8938418965550543196">"Gửi tin nhắn"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Đang tạo bản sao cá nhân..."</string>
<string name="yesterday" msgid="6840858548955018569">"Hôm qua"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8857cef..3c2f0b1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"通讯录"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"通讯录"</string>
+ <string name="people" msgid="1190841469952343354">"通讯录"</string>
<string name="contactsList" msgid="8661624236494819731">"联系人"</string>
<string name="shortcutContact" msgid="749243779392912958">"联系人"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"直接拨打电话"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"选择一个可直接拨号的号码"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"选择一个可直接向其发送短信的号码"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"选择联系人"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"创建新联系人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星标的内容"</string>
<string name="frequentList" msgid="7154768136473953056">"经常联系"</string>
<string name="strequentList" msgid="5640192862059373511">"收藏"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"查看联系人"</string>
<string name="menu_addStar" msgid="2908478235715404876">"添加到收藏"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"从收藏中移除"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"已从收藏中移除"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"已添加到收藏"</string>
<string name="menu_editContact" msgid="9042415603857662633">"修改"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"删除"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"放在主屏幕上"</string>
@@ -86,8 +82,8 @@
<string name="noContacts" msgid="8579310973261953559">"没有联系人。"</string>
<string name="noGroups" msgid="8614664663561385253">"没有任何群组。"</string>
<string name="noAccounts" msgid="7768267764545265909">"您需要拥有一个帐户才能创建群组。"</string>
- <string name="emptyGroup" msgid="7502116218697177370">"此群组中没有联系人。"</string>
- <string name="addPeopleToGroup" msgid="7879585947222263516">"要添加联系人，请修改该群组。"</string>
+ <string name="emptyGroup" msgid="7502116218697177370">"此组中没有联系人。"</string>
+ <string name="addPeopleToGroup" msgid="7879585947222263516">"要添加联系人，请修改该组。"</string>
<string name="savingContact" msgid="4075751076741924939">"正在保存联系人…"</string>
<string name="contactSavedToast" msgid="7152589189385441091">"此联系人已保存。"</string>
<string name="contactSavedErrorToast" msgid="3207250533172944892">"无法保存联系人更改。"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"联系人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"未找到可处理此操作的应用。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"点击即可返回上一屏幕"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"添加电话号码"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"添加电子邮件地址"</string>
<string name="missing_app" msgid="1466111003546611387">"未找到可处理此操作的应用。"</string>
<string name="menu_share" msgid="943789700636542260">"分享"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"添加到通讯录"</string>
<string name="share_via" msgid="563121028023030093">"联系人分享方式"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"要在哪个帐户下创建群组？"</string>
<string name="audio_chat" msgid="2535716629358298691">"语音聊天"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"使用此照片"</string>
<string name="contact_read_only" msgid="7421346527289472273">"无法通过此应用修改。"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"没有此联系人的其他信息。"</string>
<string name="group_read_only" msgid="1061762906115697637">"无法在此设备上修改。"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"列表排序依据"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名字"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓氏"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"查看联系人姓名"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
<string name="take_new_photo" msgid="7341354729436576304">"拍摄新照片"</string>
<string name="pick_photo" msgid="2129509985223564942">"选择照片"</string>
@@ -188,8 +188,8 @@
<string name="create_group_dialog_title" msgid="6874527142828424475">"创建新群组"</string>
<string name="create_group_item_label" msgid="4411981763169654825">"创建新群组"</string>
<plurals name="num_groups_in_account">
- <item quantity="one" msgid="2944819210288517794">"1个群组"</item>
- <item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g>个群组"</item>
+ <item quantity="one" msgid="2944819210288517794">"1 个群组"</item>
+ <item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> 个群组"</item>
</plurals>
<string name="delete_group_dialog_message" msgid="7586856514337560529">"要删除群组“<xliff:g id="GROUP_LABEL">%1$s</xliff:g>”（并不会删除联系人本身）吗？"</string>
<plurals name="num_contacts_in_group">
@@ -217,20 +217,21 @@
<string name="generic_no_account_prompt" msgid="7218827704367325460">"即使手机丢了，也能确保您的联系人信息的安全性：与在线服务同步。"</string>
<string name="generic_no_account_prompt_title" msgid="753783911899054860">"添加帐户"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"系统不会备份您的新联系人。要添加用于在线备份联系人的帐户吗？"</string>
- <string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"您的新联系人将会同步到<xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>。"</string>
- <string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"您可以将您的新联系人同步到以下某个帐户。请选择要使用的帐户："</string>
+ <string name="contact_editor_prompt_one_account" msgid="8669032699767375976">"系统会将您的新联系人与 <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> 同步。"</string>
+ <string name="contact_editor_prompt_multiple_accounts" msgid="611828200100438242">"您可以将您的新联系人与以下某个帐户同步。请选择要使用的帐户："</string>
<string name="contact_editor_title_new_contact" msgid="7192223018128934940">"新增联系人"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"修改联系人"</string>
<string name="keep_local" msgid="1258761699192993322">"本地保存"</string>
<string name="add_account" msgid="8201790677994503186">"添加帐户"</string>
<string name="add_new_account" msgid="5748627740680940264">"添加新帐户"</string>
<string name="menu_export_database" msgid="2659719297530170820">"导出数据库文件"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"照片（选择即可更换）"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"添加新联系人"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"查看更多"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"隐藏部分"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"查看全部"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"联系"</string>
<string name="recent_card_title" msgid="8982782042698001695">"最近"</string>
- <string name="about_card_title" msgid="2920942314212825637">"简介"</string>
<string name="send_message" msgid="8938418965550543196">"发送短信"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"正在创建个人副本…"</string>
<string name="yesterday" msgid="6840858548955018569">"昨天"</string>
@@ -241,18 +242,4 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"（未命名的活动）"</string>
<string name="date_time_set" msgid="4761419824439606690">"设置"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"聊天工具"</string>
- <string name="header_organization_entry" msgid="8515394955666265406">"单位"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"昵称"</string>
- <string name="header_note_entry" msgid="4320190426480612344">"备注"</string>
- <string name="header_website_entry" msgid="1411467850000824745">"网站"</string>
- <string name="header_event_entry" msgid="6738250422744401460">"活动"</string>
- <string name="header_relation_entry" msgid="1520292958088146460">"关系"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"到特定地点的路线"</string>
- <string name="content_description_recent_sms" msgid="6268563442222149676">"近期短信。<xliff:g id="MESSAGE_DETAILS">%s</xliff:g>。点按可回复"</string>
- <string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"来电"</string>
- <string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"外拨电话"</string>
- <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接电话"</string>
- <string name="content_description_recent_call" msgid="6204048362763219585">"近期通话。<xliff:g id="CALL_DETAILS">%s</xliff:g>。点按可回拨"</string>
- <string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4bdee84..79440db 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"通訊錄"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"通訊錄"</string>
+ <string name="people" msgid="1190841469952343354">"通訊錄"</string>
<string name="contactsList" msgid="8661624236494819731">"通訊錄"</string>
<string name="shortcutContact" msgid="749243779392912958">"聯絡人"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"直接撥號"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"選擇撥打號碼"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"選擇傳訊號碼"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"選擇聯絡人"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"建立新聯絡人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星號"</string>
<string name="frequentList" msgid="7154768136473953056">"常用聯絡人"</string>
<string name="strequentList" msgid="5640192862059373511">"我的最愛"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"查看聯絡人"</string>
<string name="menu_addStar" msgid="2908478235715404876">"新增至我的最愛"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"從「我的最愛」中移除"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"已從我的最愛中移除"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"已加到我的最愛"</string>
<string name="menu_editContact" msgid="9042415603857662633">"編輯"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"刪除"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"新增到主畫面上"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"您的聯絡人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"找不到可以處理這個操作的應用程式。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"按一下即可返回上一個畫面"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"新增電話號碼"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"新增電郵"</string>
<string name="missing_app" msgid="1466111003546611387">"找不到可以處理這個操作的應用程式。"</string>
<string name="menu_share" msgid="943789700636542260">"分享"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"加入通訊錄"</string>
<string name="share_via" msgid="563121028023030093">"使用下列應用程式分享聯絡人資訊："</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"選擇帳戶以建立群組"</string>
<string name="audio_chat" msgid="2535716629358298691">"話音通訊"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"使用這張相片"</string>
<string name="contact_read_only" msgid="7421346527289472273">"無法以這個應用程式編輯。"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"沒有這位聯絡人的其他資訊。"</string>
<string name="group_read_only" msgid="1061762906115697637">"無法在這部裝置上編輯。"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"清單排序依據"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名字"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓氏"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"查看聯絡人姓名"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
<string name="take_new_photo" msgid="7341354729436576304">"拍攝新相片"</string>
<string name="pick_photo" msgid="2129509985223564942">"選擇相片"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"新增帳戶"</string>
<string name="add_new_account" msgid="5748627740680940264">"新增帳戶"</string>
<string name="menu_export_database" msgid="2659719297530170820">"匯出資料庫檔案"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"圖片 (選取即可更改)"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"新增聯絡人"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"顯示更多"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"顯示較少"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"顯示全部"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"聯絡人"</string>
<string name="recent_card_title" msgid="8982782042698001695">"近期"</string>
- <string name="about_card_title" msgid="2920942314212825637">"關於"</string>
<string name="send_message" msgid="8938418965550543196">"傳送訊息"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"正在建立個人副本…"</string>
<string name="yesterday" msgid="6840858548955018569">"昨天"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 15b96e7..975e102 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"通訊錄"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"通訊錄"</string>
+ <string name="people" msgid="1190841469952343354">"聯絡人"</string>
<string name="contactsList" msgid="8661624236494819731">"聯絡人"</string>
<string name="shortcutContact" msgid="749243779392912958">"聯絡人"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"直接撥號"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"選擇去電號碼"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"選擇傳訊號碼"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"選擇聯絡人"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"建立新聯絡人"</string>
<string name="starredList" msgid="4817256136413959463">"已加星號"</string>
<string name="frequentList" msgid="7154768136473953056">"經常聯絡"</string>
<string name="strequentList" msgid="5640192862059373511">"我的收藏"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"檢視聯絡人"</string>
<string name="menu_addStar" msgid="2908478235715404876">"加到我的收藏"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"從我的收藏中移除"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"已從我的最愛中移除"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"已加到我的最愛"</string>
<string name="menu_editContact" msgid="9042415603857662633">"編輯"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"刪除"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"放在主螢幕上"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"您的聯絡人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"找不到可以處理這個動作的應用程式。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"按一下即可返回上一個畫面"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"新增電話號碼"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"新增電子郵件地址"</string>
<string name="missing_app" msgid="1466111003546611387">"找不到可以處理這個動作的應用程式。"</string>
<string name="menu_share" msgid="943789700636542260">"分享"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"新增為聯絡人"</string>
<string name="share_via" msgid="563121028023030093">"使用下列應用程式分享聯絡人資訊："</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"選擇帳戶以建立群組"</string>
<string name="audio_chat" msgid="2535716629358298691">"語音通訊"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"使用此相片"</string>
<string name="contact_read_only" msgid="7421346527289472273">"無法透過這個應用程式編輯。"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"沒有這位聯絡人的其他資訊。"</string>
<string name="group_read_only" msgid="1061762906115697637">"無法在這個裝置上編輯。"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"清單排序依據"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"名字"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"姓氏"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"查看聯絡人姓名"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
<string name="take_new_photo" msgid="7341354729436576304">"拍攝新相片"</string>
<string name="pick_photo" msgid="2129509985223564942">"選擇相片"</string>
@@ -154,7 +154,7 @@
<string name="menu_select_none" msgid="7093222469852132345">"全部取消選取"</string>
<string name="add_field" msgid="2384260056674995230">"新增其他欄位"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"新增"</string>
- <string name="add_organization" msgid="7311893231158291197">"填寫聯絡人任職單位"</string>
+ <string name="add_organization" msgid="7311893231158291197">"新增機構"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
<string name="group_edit_field_hint_text" msgid="3966441850870457808">"群組名稱"</string>
<string name="description_star" msgid="2605854427360036550">"我的收藏"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"新增帳戶"</string>
<string name="add_new_account" msgid="5748627740680940264">"新增帳戶"</string>
<string name="menu_export_database" msgid="2659719297530170820">"匯出資料庫檔案"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"圖片 (選取即可變更)"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"新增聯絡人"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"顯示更多"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"顯示較少"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"全部顯示"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"聯絡人"</string>
<string name="recent_card_title" msgid="8982782042698001695">"近期"</string>
- <string name="about_card_title" msgid="2920942314212825637">"關於"</string>
<string name="send_message" msgid="8938418965550543196">"傳送簡訊"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"正在建立個人副本..."</string>
<string name="yesterday" msgid="6840858548955018569">"昨天"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0758e36..8363c1e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applicationLabel" msgid="3906689777043645443">"Oxhumana nabo"</string>
- <string name="launcherActivityLabel" msgid="6497230399032392417">"Oxhumana nabo"</string>
+ <string name="people" msgid="1190841469952343354">"Oxhumana nabo"</string>
<string name="contactsList" msgid="8661624236494819731">"Othi tana nabo"</string>
<string name="shortcutContact" msgid="749243779392912958">"Othintana naye"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Ukudayela okuqondile"</string>
@@ -26,7 +25,6 @@
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Khetha inombolo ozoyishayela"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Khetha inombolo kumyalezo"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Khetha oxhumana naye"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Dala othintana naye omusha"</string>
<string name="starredList" msgid="4817256136413959463">"Okunenkanyezi"</string>
<string name="frequentList" msgid="7154768136473953056">"Okuvamile"</string>
<string name="strequentList" msgid="5640192862059373511">"Izintandokazi"</string>
@@ -41,8 +39,6 @@
<string name="menu_viewContact" msgid="2795575601596468581">"Buka othintana naye"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Engeza ezintandokazini"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Susa ezintandokazini"</string>
- <string name="description_action_menu_remove_star" msgid="4699640108012265178">"Kukhishiwe kusuka kuzintandokazi"</string>
- <string name="description_action_menu_add_star" msgid="3327186327234177456">"Kungezwe ezintandokazini"</string>
<string name="menu_editContact" msgid="9042415603857662633">"Hlela"</string>
<string name="menu_deleteContact" msgid="6788644058868189393">"Susa"</string>
<string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Indawo esikrinini sekhaya"</string>
@@ -119,11 +115,8 @@
<string name="search_settings_description" msgid="2675223022992445813">"Amagama othintana nabo"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ayikho uhlelo lokusebenza etholakele ukubhekana nalengxenye."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Chofoza ukuze ubuyele kusikrini sangaphambilini"</string>
- <string name="quickcontact_add_phone_number" msgid="731665835910658965">"Engeza inombolo yefoni"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Engeza i-imeyili"</string>
<string name="missing_app" msgid="1466111003546611387">"Alukho uhlelo lokusebenza olutholakalele ukuphatha lesi senzo."</string>
<string name="menu_share" msgid="943789700636542260">"Yabelana"</string>
- <string name="menu_add_contact" msgid="3198704337220892684">"Engeza koxhumana nabo"</string>
<string name="share_via" msgid="563121028023030093">"Abelana nothintana naye nge"</string>
<string name="dialog_new_group_account" msgid="2318032089273496830">"Yenza isigcawu ngaphansi kwe-akhawunti"</string>
<string name="audio_chat" msgid="2535716629358298691">"Ingxoxo yezw"</string>
@@ -137,7 +130,14 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Sebenzisa lesi sithombe"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Ayihleleki kulensiza"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Alukho ulwazi olwengeziwe lwalona othintana naye"</string>
<string name="group_read_only" msgid="1061762906115697637">"Ayihleleki kuledivayisi"</string>
+ <string name="display_options_sort_list_by" msgid="6080091755852211076">"Hlunga uhlu nge"</string>
+ <string name="display_options_sort_by_given_name" msgid="184916793466387067">"Igama elinikeziwe"</string>
+ <string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Igama lomkhaya"</string>
+ <string name="display_options_view_names_as" msgid="4386932036180428374">"Buka amagama woxhumana nabo"</string>
+ <string name="display_options_view_given_name_first" msgid="6968288511197363292">"Igama elinikeziwe kuqala"</string>
+ <string name="display_options_view_family_name_first" msgid="1447288164951453714">"Igama lomkhaya kuqala"</string>
<string name="take_photo" msgid="7496128293167402354">"Thatha isithombe"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Thatha isithombe esisha"</string>
<string name="pick_photo" msgid="2129509985223564942">"Khetha isithombe"</string>
@@ -155,7 +155,7 @@
<string name="add_field" msgid="2384260056674995230">"Yengeza enye inkambu"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Faka okusha"</string>
<string name="add_organization" msgid="7311893231158291197">"Ngeza inhlangano"</string>
- <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Idethi"</string>
+ <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Usuku"</string>
<string name="group_edit_field_hint_text" msgid="3966441850870457808">"Igama leqembu"</string>
<string name="description_star" msgid="2605854427360036550">"intandokazi"</string>
<string name="edit_contact" msgid="7529281274005689512">"Hlela othintana naye"</string>
@@ -225,12 +225,13 @@
<string name="add_account" msgid="8201790677994503186">"Engeza i-akhawunti"</string>
<string name="add_new_account" msgid="5748627740680940264">"Yengeza i-akhawunti enthsha"</string>
<string name="menu_export_database" msgid="2659719297530170820">"Khipha amafayela emininingo egciniwe"</string>
+ <string name="contact_detail_picture_description" msgid="6083230522651287030">"Isithombe. Khetha ukuze ushintshe"</string>
<string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"engeza oxhumana naye omusha"</string>
<string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Buka okuningi"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Buka okuncane"</string>
<string name="expanding_entry_card_view_see_all" msgid="3845258737661412627">"Buka konke"</string>
+ <string name="communication_card_title" msgid="7842656156852232185">"Oxhumana naye"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Okwakamuva"</string>
- <string name="about_card_title" msgid="2920942314212825637">"Mayelana"</string>
<string name="send_message" msgid="8938418965550543196">"Thumela umlayezo"</string>
<string name="toast_making_personal_copy" msgid="6137651078366797938">"Idala ikhophi yomuntu siqu..."</string>
<string name="yesterday" msgid="6840858548955018569">"Izolo"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 985a4e5..c3bf79e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,8 +37,8 @@
<color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
- <!-- Color of the separator between entries in an ExpandingEntryCardView -->
- <color name="expanding_entry_card_item_separator_color">#e4e4e4</color>
+ <!-- Horizontal separator line should be 12% dark in the light theme. -->
+ <color name="divider_line_color_light">#e0e0e0</color>
<!-- Color of the text on an ExpandingEntryCard button -->
<color name="expanding_entry_card_button_text_color">@android:color/black</color>
@@ -54,4 +54,10 @@
<!-- Background color of pinned header items. -->
<color name="list_item_pinned_header_color">@color/background_primary</color>
+
+ <!-- Color of the mime-type icons inside the editor. 50% black. -->
+ <color name="editor_icon_color">#7f7f7f</color>
+
+ <!-- Color of disabled text and unfocused hint text inside the contact editor. -->
+ <color name="editor_disabled_text_color">#989898</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 865704f..a6afca6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,40 +22,74 @@
<dimen name="quickcontact_maximum_title_size">36dp</dimen>
<!-- When QC is uncollapsed, the title has this much margin on its left, right and bottom -->
<dimen name="quickcontact_title_initial_margin">16dp</dimen>
-
- <!-- Top padding of the entire contact editor -->
- <dimen name="editor_padding_top">0dip</dimen>
+ <!-- The ratio of width:height for the contact's photo in landscape -->
+ <item name="quickcontact_landscape_photo_ratio" type="dimen" format="float">0.7</item>
+ <!-- How far QuickContacts can be dragged and released from the top of the window before we dismiss it. -->
+ <dimen name="quickcontact_dismiss_distance_on_release">40dp</dimen>
+ <!-- How far QuickContacts can be dragged from the top of the window before we dismiss it. -->
+ <dimen name="quickcontact_dismiss_distance_on_scroll">100dp</dimen>
+ <!-- When first flinging QuickContacts towards the top of the window if the fling is
+ predicted to scroll past the window top by less than this amount, then QuickContacts
+ snaps to the top of the window. -->
+ <dimen name="quickcontact_snap_to_top_slop_height">33dp</dimen>
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
- <dimen name="editor_round_button_padding_left">8dip</dimen>
- <dimen name="editor_round_button_padding_right">8dip</dimen>
- <dimen name="editor_round_button_padding_top">8dip</dimen>
- <dimen name="editor_round_button_padding_bottom">8dip</dimen>
+ <dimen name="editor_round_button_padding_left">16dip</dimen>
+ <dimen name="editor_round_button_padding_right">16dip</dimen>
+ <dimen name="editor_round_button_padding_top">16dip</dimen>
+ <dimen name="editor_round_button_padding_bottom">16dip</dimen>
<!-- Minimum height of a row in the Editor -->
<dimen name="editor_min_line_item_height">48dip</dimen>
- <!-- Top padding of an EditText in the Editor -->
- <dimen name="editor_text_field_top_padding">8dip</dimen>
+ <!-- Width of the delete button (X) in the raw contact editor -->
+ <dimen name="editor_delete_button_width">48dp</dimen>
- <!-- Bottom padding of an EditText in the Editor -->
- <dimen name="editor_text_field_bottom_padding">7dip</dimen>
+ <!-- The height and width of the delete button should be the same size as an editor row -->
+ <dimen name="editor_delete_button_size">@dimen/editor_min_line_item_height</dimen>
- <!-- Right padding of a field in the Editor -->
- <dimen name="editor_field_right_padding">4dip</dimen>
+ <!-- Top margin applied to mime-type icons inside the editor. This is needed to give the
+ appearance that the icons are top aligned with the text, since visible text doesn't
+ start at the very top of TextViews. -->
+ <dimen name="editor_kind_icon_top_margin">14dp</dimen>
- <!-- Left padding of a field in the Editor -->
- <dimen name="editor_field_left_padding">4dip</dimen>
+ <!-- RHS padding added to spinners in the editor. This separates the spinner text from the
+ spinner graphic since b/18194928 causes the spinner to always be on the RHS.
+ In LTR mode this shouldn't have an observable affect. We set paddingRight instead of
+ drawablePadding since the spinner graphic is not a normal drawable. -->
+ <dimen name="editor_spinner_right_padding_workaround">24dip</dimen>
- <!-- End padding added to spinners in the editor. This separates the spinner text from the
- spinner graphic when Button gravity is incorrectly set in RTL mode
- (see framework bug b/17011078. In LTR mode this shouldn't have an observable affect.
- We set paddingEnd instead of drawablePadding since the spinner graphic is not a normal
- drawable. -->
- <dimen name="editor_spinner_end_padding_workaround">24dip</dimen>
+ <!-- Size of input form text inside the contact editor -->
+ <dimen name="editor_form_text_size">16sp</dimen>
+
+ <!-- Width and height of the mime-type icons inside the editor -->
+ <dimen name="editor_kind_icon_size">24dp</dimen>
+
+ <!-- Total width of data-kind icon, including its start and end padding -->
+ <dimen name="editor_kind_icon_total_width">68dp</dimen>
+
+ <!-- Padding below every editor view, such as LabeledEditorView. This value is chosen
+ to give 32dp of apparent padding between EditText's in the Raw Contact Editor. -->
+ <dimen name="editor_padding_between_editor_views">15dp</dimen>
+
+ <!-- Padding below every readonly editor view. This value is chosen to give 32dp of apparent padding
+ between TextView's in the readonly Raw Contact Editor. -->
+ <dimen name="editor_padding_between_read_only_editor_views">25dp</dimen>
+
+ <!-- Padding above and below the photo editor. This value is chosen to give 32dp of apparent
+ padding between TextView's and the photo's ImageView. -->
+ <dimen name="editor_padding_around_read_only_photo_editor">28dp</dimen>
+
+ <!-- Padding below the photo editor. This value is larger than
+ editor_padding_between_editor_views, since ImageView's don't have space between the bottom
+ of their visual bottom, like an EditText does. -->
+ <dimen name="editor_padding_below_photo">21dp</dimen>
<!-- Width of the Type-Label in the Editor -->
- <dimen name="editor_type_label_width">100dip</dimen>
+ <dimen name="editor_type_label_width">150dip</dimen>
+
+ <!-- Width of the drop down that appears when you click on the Type-Label spinner in the editor -->
+ <dimen name="editor_type_label_dropdown_width">150dp</dimen>
<!-- Left padding of the label in the add field button for the contact editor -->
<dimen name="editor_add_field_label_left_padding">16dip</dimen>
@@ -153,8 +187,9 @@
<!-- Extra top padding if the title is set to null -->
<dimen name="expanding_entry_card_null_title_top_extra_padding">2dp</dimen>
- <!-- Height of the separator between entries in an ExpandingEntryCardView -->
- <dimen name="expanding_entry_card_item_separator_height">1dp</dimen>
+ <!-- Height of the separator between entries in an ExpandingEntryCardView and contact editor. -->
+ <dimen name="divider_line_height">1dp</dimen>
+
<!-- Dimensions for an entry in ExpandingEntryCardView -->
<dimen name="expanding_entry_card_item_padding_start">20dp</dimen>
<dimen name="expanding_entry_card_item_padding_end">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d1c405..e11a519 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,6 +47,9 @@
<!-- Activity title when the user is selecting a contact for a direct message shortcut. -->
<string name="messageShortcutActivityTitle">Choose a number to message</string>
+ <!-- Activity title when the user is inserting into an existing contact, or creating a new one. [CHAR LIMIT=128] -->
+ <string name="contactInsertOrEditActivityTitle">Add to contact</string>
+
<!-- Activity title when the user is selecting a contact. [CHAR LIMIT=128] -->
<string name="contactPickerActivityTitle">Choose a contact</string>
@@ -370,9 +373,6 @@
<!-- String describing which account a contact came from when editing it -->
<string name="from_account_format"><xliff:g id="source" example="user@gmail.com">%1$s</xliff:g></string>
- <!-- Checkbox asking the user if they want to display a particular photo for a contact -->
- <string name="use_photo_as_primary">Use this photo</string>
-
<!-- Text used to explain that a contact cannot be edited from the People application since the data is read only [CHAR LIMIT=40] -->
<string name="contact_read_only">Not editable from this app.</string>
@@ -423,9 +423,6 @@
<!-- Label to clear all selection in multiple picker -->
<string name="menu_select_none">"Unselect all"</string>
- <!-- The add field button shown in the editor under each editable Raw Contact [CHAR LIMIT=30] -->
- <string name="add_field">Add another field</string>
-
<!-- The button to add another entry of a specific data type (i.e. email, phone, address) to a contact in the Raw Contact Editor [CHAR LIMIT=22] -->
<string name="add_new_entry_for_section">Add new</string>
@@ -438,6 +435,12 @@
<!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
<string name="group_edit_field_hint_text">Group name</string>
+ <!-- Button used for changing a photo in the Raw Contact Editor [CHAR LIMIT=15] -->
+ <string name="change_photo">Change</string>
+
+ <!-- RadioButton that determines whether a raw contact's photo should be used for the entire contact [CHAR LIMIT=15] -->
+ <string name="primary_photo">Primary photo</string>
+
<!-- String describing the Star/Favorite checkbox
Used by AccessibilityService to announce the purpose of the view.
@@ -702,12 +705,27 @@
<string name="header_event_entry">Event</string>
<!-- Header for the Relation entry [CHAR LIMIT=40] -->
<string name="header_relation_entry">Relation</string>
+ <!-- Content description for the account field header image. Example accounts listed in this field: Google, Hotmail and Exchange. [CHAR LIMIT=NONE] -->
+ <string name="header_account_entry">Account</string>
+ <!-- Content description for the name fields header entry [CHAR LIMIT=NONE] -->
+ <string name="header_name_entry">Name</string>
+ <!-- Content description for the email fields header entry [CHAR LIMIT=NONE] -->
+ <string name="header_email_entry">Email</string>
+ <!-- Content description for the phone fields header entry [CHAR LIMIT=NONE] -->
+ <string name="header_phone_entry">Phone</string>
+ <!-- Content description for the camera icon beside the photo section in the Raw Contact Editor [CHAR LIMIT=NONE] -->
+ <string name="header_photo_entry">Photo</string>
+
+ <!-- Content description for the expand button inside the raw contact editor's header. [CHAR LIMIT=NONE] -->
+ <string name="content_description_expand_editor">Click to expand contact editor.</string>
+ <!-- Content description for the collapse button inside the raw contact editor's header. [CHAR LIMIT=NONE] -->
+ <string name="content_description_collapse_editor">Click to collapse contact editor.</string>
<!-- Content description for directions secondary button [CHAR LIMIT=NONE] -->
<string name="content_description_directions">directions to location</string>
<!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
- <string name="content_description_recent_sms">recent sms. <xliff:g id="message_details">%s</xliff:g>. click to respond</string>
+ <string name="content_description_recent_sms">recent sms. <xliff:g id="message_body">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to respond</string>
<!-- Header for the Relation entry [CHAR LIMIT=NONE] -->
<string name="content_description_recent_call_type_incoming">incoming</string>
@@ -717,11 +735,14 @@
<string name="content_description_recent_call_type_missed">missed</string>
<!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
- <string name="content_description_recent_call">recent call. <xliff:g id="call_details">%s</xliff:g>. click to call back</string>
+ <string name="content_description_recent_call">recent call. <xliff:g id="call_type">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to call back</string>
<!-- Prefix for messages that you sent [CHAR LIMIT=40] -->
<string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>
<!-- File Authority for the photo picker -->
<string name="photo_file_provider_authority" translatable="false">com.android.contacts.files</string>
+
+ <!-- When a user tries to create an IM Hangouts field, an alert dialog pops up displaying this message. We don't want users entering email addresses of phone numbers into the IM field. [CHAR LIMIT=200] -->
+ <string name="contact_editor_hangouts_im_alert">Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field.</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e2bf0aa..06f1afe 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
<style name="EditorActivityTheme" parent="@style/PeopleTheme">
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:actionBarStyle">@style/EditorActionBarStyle</item>
+ <item name="android:colorButtonNormal">@color/background_primary</item>
</style>
<style name="Theme">
@@ -59,6 +60,7 @@
<item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
<!-- Style for the overflow button in the actionbar. -->
<item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
+ <item name="android:actionModeCloseDrawable">@drawable/ic_close_lt</item>
<item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
<item name="android:textColorSecondary">@color/secondary_text_color</item>
@@ -283,11 +285,14 @@
<item name="android:layout_height">wrap_content</item>
</style>
- <style name="SpinnerButtonStyle" parent="@android:style/Widget.Material.Spinner">
+ <style name="SpinnerButtonStyle" parent="@android:style/Widget.Material.Spinner.Underlined">
<!-- When applying the spinner style to a Button we need to disable the shadow animation
on the button since the spinner background is transparent. Otherwise the spinner-button
will look ridiculous. -->
<item name="android:stateListAnimator">@null</item>
+ <!-- We want our spinner's to use the same gravity as an EditText, so that they look
+ visually consistent with other controls in our forms -->
+ <item name="android:gravity">start|center_vertical</item>
</style>
<style name="EditKindSeparatorTextViewStyle" parent="ContactListSeparatorTextViewStyle">
@@ -307,4 +312,15 @@
<style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
<item name="android:colorAccent">@color/primary_color</item>
</style>
+
+ <style name="EditKindIconStyle">
+ <item name="android:layout_width">24dp</item>
+ <item name="android:layout_height">24dp</item>
+ <item name="android:tint">@color/editor_icon_color</item>
+ <item name="android:layout_marginStart">16dp</item>
+ <!-- We want 32dp of padding between these icon's and EditText's. Since EditText's have
+ 4dp of starting padding built in, we set this as 28dp. -->
+ <item name="android:layout_marginEnd">28dp</item>
+ <item name="android:layout_marginTop">@dimen/editor_kind_icon_top_margin</item>
+ </style>
</resources>
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bb03705..7d355cd 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -182,6 +182,10 @@
@Override
protected void onHandleIntent(Intent intent) {
+ if (intent == null) {
+ Log.d(TAG, "onHandleIntent: could not handle null intent");
+ return;
+ }
// Call an appropriate method. If we're sure it affects how incoming phone calls are
// handled, then notify the fact to in-call screen.
String action = intent.getAction();
@@ -514,8 +518,12 @@
private long getInsertedRawContactId(
final ArrayList<ContentProviderOperation> diff,
final ContentProviderResult[] results) {
+ if (results == null) {
+ return -1;
+ }
final int diffSize = diff.size();
- for (int i = 0; i < diffSize; i++) {
+ final int numResults = results.length;
+ for (int i = 0; i < diffSize && i < numResults; i++) {
ContentProviderOperation operation = diff.get(i);
if (operation.getType() == ContentProviderOperation.TYPE_INSERT
&& operation.getUri().getEncodedPath().contains(
@@ -816,6 +824,9 @@
// Undemote the contact if necessary
final Cursor c = getContentResolver().query(contactUri, new String[] {Contacts._ID},
null, null, null);
+ if (c == null) {
+ return;
+ }
try {
if (c.moveToFirst()) {
final long id = c.getLong(0);
@@ -1004,6 +1015,11 @@
JoinContactQuery.PROJECTION,
JoinContactQuery.SELECTION,
new String[]{String.valueOf(contactId1), String.valueOf(contactId2)}, null);
+ if (c == null) {
+ Log.e(TAG, "Unable to open Contacts DB cursor");
+ showToast(R.string.contactSavedErrorToast);
+ return;
+ }
long rawContactIds[];
long verifiedNameRawContactId = -1;
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 2d2a782..ff6a1ae 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -34,6 +34,8 @@
import com.android.contacts.common.model.AccountTypeManager;
import com.android.contacts.common.testing.InjectedServices;
import com.android.contacts.common.util.Constants;
+import com.android.contacts.commonbind.analytics.AnalyticsUtil;
+
import com.google.common.annotations.VisibleForTesting;
public final class ContactsApplication extends Application {
@@ -128,6 +130,8 @@
if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) {
Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate finish");
}
+
+ AnalyticsUtil.initialize(this);
}
private class DelayedInitializer extends AsyncTask<Void, Void, Void> {
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 6a5c1cb..4b9e83f 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -30,7 +30,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
-import android.widget.SearchView;
import android.widget.SearchView.OnCloseListener;
import android.view.View.OnClickListener;
import android.widget.EditText;
@@ -143,7 +142,7 @@
new OnClickListener() {
@Override
public void onClick(View v) {
- mSearchView.setText(null);
+ setQueryString(null);
}
});
mSearchContainer.findViewById(R.id.search_back_button).setOnClickListener(
@@ -253,10 +252,13 @@
return;
}
if (mSearchMode) {
+ mSearchView.setEnabled(true);
setFocusOnSearchView();
} else {
- mSearchView.setText(null);
+ // Disable search view, so that it doesn't keep the IME visible.
+ mSearchView.setEnabled(false);
}
+ setQueryString(null);
} else if (flag) {
// Everything is already set up. Still make sure the keyboard is up
if (mSearchView != null) setFocusOnSearchView();
@@ -271,6 +273,10 @@
mQueryString = query;
if (mSearchView != null) {
mSearchView.setText(query);
+ // When programmatically entering text into the search view, the most reasonable
+ // place for the cursor is after all the text.
+ mSearchView.setSelection(mSearchView.getText() == null ?
+ 0 : mSearchView.getText().length());
}
}
@@ -396,18 +402,6 @@
outState.putInt(EXTRA_KEY_SELECTED_TAB, mCurrentTab);
}
- /**
- * Clears the focus from the {@link SearchView} if we are in search mode.
- * This will suppress the IME if it is visible.
- */
- public void clearFocusOnSearchView() {
- if (isSearchMode()) {
- if (mSearchView != null) {
- mSearchView.clearFocus();
- }
- }
- }
-
public void setFocusOnSearchView() {
mSearchView.requestFocus();
showInputMethod(mSearchView); // Workaround for the "IME not popping up" issue.
diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index 4c4d4dc..3196f87 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -16,20 +16,22 @@
package com.android.contacts.activities;
+import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
+import android.content.ContentValues;
import android.content.Intent;
import android.content.Loader;
import android.content.Loader.OnLoadCompleteListener;
-import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Bundle;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.DisplayPhoto;
+import android.provider.ContactsContract.Intents;
+import android.provider.ContactsContract.RawContacts;
import android.util.Log;
import android.widget.Toast;
@@ -44,9 +46,10 @@
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.model.account.AccountType;
import com.android.contacts.common.model.ValuesDelta;
+import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.editor.ContactEditorUtils;
import com.android.contacts.util.ContactPhotoUtils;
-import java.io.File;
import java.io.FileNotFoundException;
/**
@@ -60,6 +63,7 @@
private static final int REQUEST_PICK_CONTACT = 1;
private static final int REQUEST_CROP_PHOTO = 2;
+ private static final int REQUEST_PICK_DEFAULT_ACCOUNT_FOR_NEW_CONTACT = 3;
private static final String KEY_CONTACT_URI = "contact_uri";
private static final String KEY_TEMP_PHOTO_URI = "temp_photo_uri";
@@ -130,7 +134,24 @@
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent result) {
- if (requestCode == REQUEST_PICK_CONTACT) {
+ if (requestCode == REQUEST_PICK_DEFAULT_ACCOUNT_FOR_NEW_CONTACT) {
+ // Bail if the account selector was not successful.
+ if (resultCode != Activity.RESULT_OK) {
+ Log.w(TAG, "account selector was not successful");
+ finish();
+ return;
+ }
+ // If there's an account specified, use it.
+ if (result != null) {
+ AccountWithDataSet account = result.getParcelableExtra(Intents.Insert.ACCOUNT);
+ if (account != null) {
+ createNewRawContact(account);
+ return;
+ }
+ }
+ // If there isn't an account specified, then the user opted to keep the contact local.
+ createNewRawContact(null);
+ } else if (requestCode == REQUEST_PICK_CONTACT) {
if (resultCode != RESULT_OK) {
finish();
return;
@@ -225,10 +246,17 @@
RawContactDeltaList deltaList = contact.createRawContactDeltaList();
RawContactDelta raw = deltaList.getFirstWritableRawContact(this);
if (raw == null) {
- Log.w(TAG, "no writable raw-contact found");
+ // We can't directly insert this photo since no raw contacts exist in the contact.
+ selectAccountAndCreateContact();
return;
}
+ saveToContact(contact, deltaList, raw);
+ }
+
+ private void saveToContact(Contact contact, RawContactDeltaList deltaList,
+ RawContactDelta raw) {
+
// Create a scaled, compressed bitmap to add to the entity-delta list.
final int size = ContactsUtils.getThumbnailSize(this);
Bitmap bitmap;
@@ -236,10 +264,12 @@
bitmap = ContactPhotoUtils.getBitmapFromUri(this, mCroppedPhotoUri);
} catch (FileNotFoundException e) {
Log.w(TAG, "Could not find bitmap");
+ finish();
return;
}
if (bitmap == null) {
Log.w(TAG, "Could not decode bitmap");
+ finish();
return;
}
@@ -247,8 +277,10 @@
final byte[] compressed = ContactPhotoUtils.compressBitmap(scaled);
if (compressed == null) {
Log.w(TAG, "could not create scaled and compressed Bitmap");
+ finish();
return;
}
+
// Add compressed bitmap to entity-delta... this allows us to save to
// a new contact; otherwise the entity-delta-list would be empty, and
// the ContactSaveService would not create the new contact, and the
@@ -258,6 +290,7 @@
RawContactModifier.ensureKindExists(raw, account, Photo.CONTENT_ITEM_TYPE);
if (values == null) {
Log.w(TAG, "cannot attach photo to this account type");
+ finish();
return;
}
values.setPhoto(compressed);
@@ -270,10 +303,52 @@
"", 0,
contact.isUserProfile(),
null, null,
- raw.getRawContactId(),
+ raw.getRawContactId() != null ? raw.getRawContactId() : -1,
mCroppedPhotoUri
- );
+ );
startService(intent);
finish();
}
+
+ private void selectAccountAndCreateContact() {
+ // If there is no default account or the accounts have changed such that we need to
+ // prompt the user again, then launch the account prompt.
+ final ContactEditorUtils editorUtils = ContactEditorUtils.getInstance(this);
+ if (editorUtils.shouldShowAccountChangedNotification()) {
+ Intent intent = new Intent(this, ContactEditorAccountsChangedActivity.class);
+ startActivityForResult(intent, REQUEST_PICK_DEFAULT_ACCOUNT_FOR_NEW_CONTACT);
+ } else {
+ // Otherwise, there should be a default account. Then either create a local contact
+ // (if default account is null) or create a contact with the specified account.
+ AccountWithDataSet defaultAccount = editorUtils.getDefaultAccount();
+ if (defaultAccount == null) {
+ createNewRawContact(null);
+ } else {
+ createNewRawContact(defaultAccount);
+ }
+ }
+ }
+
+ /**
+ * Create a new writeable raw contact to store mCroppedPhotoUri.
+ */
+ private void createNewRawContact(final AccountWithDataSet account) {
+ // Reload the contact from URI instead of trying to pull the contact from a member variable,
+ // since this function can be called after the activity stops and resumes.
+ loadContact(mContactUri, new Listener() {
+ @Override
+ public void onContactLoaded(Contact contactToSave) {
+ final RawContactDeltaList deltaList = contactToSave.createRawContactDeltaList();
+ final ContentValues after = new ContentValues();
+ after.put(RawContacts.ACCOUNT_TYPE, account != null ? account.type : null);
+ after.put(RawContacts.ACCOUNT_NAME, account != null ? account.name : null);
+ after.put(RawContacts.DATA_SET, account != null ? account.dataSet : null);
+
+ final RawContactDelta newRawContactDelta
+ = new RawContactDelta(ValuesDelta.fromAfter(after));
+ deltaList.add(newRawContactDelta);
+ saveToContact(contactToSave, deltaList, newRawContactDelta);
+ }
+ });
+ }
}
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 5f382a7..c350da9 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -95,31 +95,15 @@
ActionBar actionBar = getActionBar();
if (actionBar != null) {
- // Inflate a custom action bar that contains the "done" button for saving changes
- // to the contact
- LayoutInflater inflater = (LayoutInflater) getSystemService
- (Context.LAYOUT_INFLATER_SERVICE);
- View customActionBarView = inflater.inflate(R.layout.editor_custom_action_bar, null);
- View saveMenuItem = customActionBarView.findViewById(R.id.save_menu_item);
- saveMenuItem.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mFragment.doSaveAction();
- }
- });
- TextView title = (TextView) customActionBarView.findViewById(R.id.title);
if (Intent.ACTION_EDIT.equals(action)) {
- title.setText(getResources().getString(
+ actionBar.setTitle(getResources().getString(
R.string.contact_editor_title_existing_contact));
} else {
- title.setText(getResources().getString(
+ actionBar.setTitle(getResources().getString(
R.string.contact_editor_title_new_contact));
}
- // Show the custom action bar but hide the home icon and title
- actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
- ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_SHOW_HOME |
- ActionBar.DISPLAY_SHOW_TITLE);
- actionBar.setCustomView(customActionBarView);
+ actionBar.setDisplayShowHomeEnabled(true);
+ actionBar.setDisplayHomeAsUpEnabled(true);
}
mFragment = (ContactEditorFragment) getFragmentManager().findFragmentById(
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index c35f192..53f685c 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -83,6 +83,7 @@
private int mActionCode = -1;
private boolean mIsSearchMode;
+ private boolean mIsSearchSupported;
private ContactsRequest mRequest;
private SearchView mSearchView;
@@ -153,6 +154,8 @@
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowTitleEnabled(true);
}
+ mIsSearchSupported = false;
+ configureSearchMode();
return;
}
@@ -174,6 +177,7 @@
new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
actionBar.setDisplayShowCustomEnabled(true);
+ mIsSearchSupported = true;
configureSearchMode();
}
@@ -223,7 +227,7 @@
int actionCode = mRequest.getActionCode();
switch (actionCode) {
case ContactsRequest.ACTION_INSERT_OR_EDIT_CONTACT: {
- setTitle(R.string.contactPickerActivityTitle);
+ setTitle(R.string.contactInsertOrEditActivityTitle);
break;
}
@@ -660,7 +664,7 @@
inflater.inflate(R.menu.search_menu, menu);
final MenuItem searchItem = menu.findItem(R.id.menu_search);
- searchItem.setVisible(!mIsSearchMode);
+ searchItem.setVisible(!mIsSearchMode && mIsSearchSupported);
return true;
}
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 9f25e4e..6d8d231 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -19,6 +19,7 @@
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
+import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.graphics.Rect;
import android.net.Uri;
@@ -45,6 +46,7 @@
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ImageButton;
+import android.widget.Toast;
import android.widget.Toolbar;
import com.android.contacts.ContactsActivity;
@@ -572,7 +574,7 @@
private void showEmptyStateForTab(int tab) {
if (mContactsUnavailableFragment != null) {
- switch (tab) {
+ switch (getTabPositionForTextDirection(tab)) {
case TabState.FAVORITES:
mContactsUnavailableFragment.setMessageText(
R.string.listTotalAllContactsZeroStarred, -1);
@@ -1022,7 +1024,7 @@
clearFrequentsMenu.setVisible(false);
helpMenu.setVisible(false);
} else {
- switch (mActionBarAdapter.getCurrentTab()) {
+ switch (getTabPositionForTextDirection(mActionBarAdapter.getCurrentTab())) {
case TabState.FAVORITES:
contactsFilterMenu.setVisible(false);
clearFrequentsMenu.setVisible(hasFrequents());
@@ -1188,8 +1190,8 @@
&& !Character.isWhitespace(unicodeChar)) {
String query = new String(new int[]{ unicodeChar }, 0, 1);
if (!mActionBarAdapter.isSearchMode()) {
- mActionBarAdapter.setQueryString(query);
mActionBarAdapter.setSearchMode(true);
+ mActionBarAdapter.setQueryString(query);
return true;
}
}
@@ -1263,7 +1265,12 @@
if (extras != null) {
intent.putExtras(extras);
}
- startActivity(intent);
+ try {
+ startActivity(intent);
+ } catch (ActivityNotFoundException ex) {
+ Toast.makeText(PeopleActivity.this, R.string.missing_app,
+ Toast.LENGTH_SHORT).show();
+ }
break;
default:
Log.wtf(TAG, "Unexpected onClick event from " + view);
diff --git a/src/com/android/contacts/activities/PhotoSelectionActivity.java b/src/com/android/contacts/activities/PhotoSelectionActivity.java
index da0d2e4..c81c448 100644
--- a/src/com/android/contacts/activities/PhotoSelectionActivity.java
+++ b/src/com/android/contacts/activities/PhotoSelectionActivity.java
@@ -486,7 +486,7 @@
// from the gallery), but with slightly different wording.
// Note: don't worry about this being a read-only contact; this code will not be invoked.
int mode = (mPhotoUri == null) ? PhotoActionPopup.Modes.NO_PHOTO
- : PhotoActionPopup.Modes.PHOTO_DISALLOW_PRIMARY;
+ : PhotoActionPopup.Modes.WRITE_ABLE_PHOTO;
// We don't want to provide a choice to remove the photo for two reasons:
// 1) the UX designs don't call for it
// 2) even if we wanted to, the implementation would be moderately hairy
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index abf89b6..0489065 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -213,7 +213,7 @@
final CharSequence message = getResources().getString(
R.string.add_contact_dlg_message_fmt, mCreateDescrip);
- return new AlertDialog.Builder(this, AlertDialog.THEME_HOLO_LIGHT)
+ return new AlertDialog.Builder(this)
.setMessage(message)
.setPositiveButton(android.R.string.ok,
new IntentClickListener(this, createIntent))
diff --git a/src/com/android/contacts/detail/PhotoSelectionHandler.java b/src/com/android/contacts/detail/PhotoSelectionHandler.java
index d2363de..9919773 100644
--- a/src/com/android/contacts/detail/PhotoSelectionHandler.java
+++ b/src/com/android/contacts/detail/PhotoSelectionHandler.java
@@ -65,7 +65,7 @@
private static final int mDefaultPhotoDim = 720;
protected final Context mContext;
- private final View mPhotoView;
+ private final View mChangeAnchorView;
private final int mPhotoMode;
private final int mPhotoPickSize;
private final Uri mCroppedPhotoUri;
@@ -74,10 +74,10 @@
private final boolean mIsDirectoryContact;
private ListPopupWindow mPopup;
- public PhotoSelectionHandler(Context context, View photoView, int photoMode,
+ public PhotoSelectionHandler(Context context, View changeAnchorView, int photoMode,
boolean isDirectoryContact, RawContactDeltaList state) {
mContext = context;
- mPhotoView = photoView;
+ mChangeAnchorView = changeAnchorView;
mPhotoMode = photoMode;
mTempPhotoUri = ContactPhotoUtils.generateTempImageUri(context);
mCroppedPhotoUri = ContactPhotoUtils.generateTempCroppedImageUri(mContext);
@@ -98,7 +98,7 @@
if (listener != null) {
if (getWritableEntityIndex() != -1) {
mPopup = PhotoActionPopup.createPopupMenu(
- mContext, mPhotoView, listener, mPhotoMode);
+ mContext, mChangeAnchorView, listener, mPhotoMode);
mPopup.setOnDismissListener(new OnDismissListener() {
@Override
public void onDismiss() {
@@ -319,11 +319,6 @@
public abstract class PhotoActionListener implements PhotoActionPopup.Listener {
@Override
- public void onUseAsPrimaryChosen() {
- // No default implementation.
- }
-
- @Override
public void onRemovePictureChosen() {
// No default implementation.
}
diff --git a/src/com/android/contacts/editor/BaseRawContactEditorView.java b/src/com/android/contacts/editor/BaseRawContactEditorView.java
index 7e74cfb..01742bb 100644
--- a/src/com/android/contacts/editor/BaseRawContactEditorView.java
+++ b/src/com/android/contacts/editor/BaseRawContactEditorView.java
@@ -19,13 +19,16 @@
import android.content.Context;
import android.database.Cursor;
import android.graphics.Bitmap;
+import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.RawContacts;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.TextView;
import com.android.contacts.R;
import com.android.contacts.common.model.RawContactDelta;
@@ -33,6 +36,7 @@
import com.android.contacts.common.model.RawContactModifier;
import com.android.contacts.common.model.account.AccountType;
import com.android.contacts.common.model.account.AccountType.EditType;
+import com.android.contacts.common.model.account.AccountWithDataSet;
/**
* Base view that provides common code for the editor interaction for a specific
@@ -46,12 +50,19 @@
public abstract class BaseRawContactEditorView extends LinearLayout {
private PhotoEditorView mPhoto;
- private boolean mHasPhotoEditor = false;
- private View mBody;
- private View mDivider;
+ private View mAccountHeaderContainer;
+ private ImageView mExpandAccountButton;
+ private LinearLayout mCollapsibleSection;
+ private TextView mAccountName;
+ private TextView mAccountType;
- private boolean mExpanded = true;
+ protected Listener mListener;
+
+ public interface Listener {
+ void onExternalEditorRequest(AccountWithDataSet account, Uri uri);
+ void onEditorExpansionChanged();
+ }
public BaseRawContactEditorView(Context context) {
super(context);
@@ -65,38 +76,48 @@
protected void onFinishInflate() {
super.onFinishInflate();
- mBody = findViewById(R.id.body);
- mDivider = findViewById(R.id.divider);
-
mPhoto = (PhotoEditorView)findViewById(R.id.edit_photo);
mPhoto.setEnabled(isEnabled());
+
+ mAccountHeaderContainer = findViewById(R.id.account_header_container);
+ mExpandAccountButton = (ImageView) findViewById(R.id.expand_account_button);
+ mCollapsibleSection = (LinearLayout) findViewById(R.id.collapsable_section);
+ mAccountName = (TextView) findViewById(R.id.account_name);
+ mAccountType = (TextView) findViewById(R.id.account_type);
+
+ setCollapsed(false);
+ setCollapsible(true);
}
public void setGroupMetaData(Cursor groupMetaData) {
}
+
+ public void setListener(Listener listener) {
+ mListener = listener;
+ }
+
/**
* Assign the given {@link Bitmap} to the internal {@link PhotoEditorView}
- * for the {@link RawContactDelta} currently being edited.
+ * in order to update the {@link RawContactDelta} currently being edited.
*/
- public void setPhotoBitmap(Bitmap bitmap) {
- mPhoto.setPhotoBitmap(bitmap);
+ public void setPhotoEntry(Bitmap bitmap) {
+ mPhoto.setPhotoEntry(bitmap);
+ }
+
+ /**
+ * Assign the given photo {@link Uri} to UI of the {@link PhotoEditorView}, so that it can
+ * display a full sized photo.
+ */
+ public void setFullSizedPhoto(Uri uri) {
+ mPhoto.setFullSizedPhoto(uri);
}
protected void setHasPhotoEditor(boolean hasPhotoEditor) {
- mHasPhotoEditor = hasPhotoEditor;
mPhoto.setVisibility(hasPhotoEditor ? View.VISIBLE : View.GONE);
}
/**
- * Return true if the current {@link RawContacts} supports {@link Photo},
- * which means that {@link PhotoEditorView} is enabled.
- */
- public boolean hasPhotoEditor() {
- return mHasPhotoEditor;
- }
-
- /**
* Return true if internal {@link PhotoEditorView} has a {@link Photo} set.
*/
public boolean hasSetPhoto() {
@@ -113,25 +134,88 @@
public abstract long getRawContactId();
/**
+ * If {@param isCollapsible} is TRUE, then this editor can be collapsed by clicking on its
+ * account header.
+ */
+ public void setCollapsible(boolean isCollapsible) {
+ if (isCollapsible) {
+ mAccountHeaderContainer.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ final int startingHeight = mCollapsibleSection.getMeasuredHeight();
+ final boolean isCollapsed = isCollapsed();
+ setCollapsed(!isCollapsed);
+ // The slideAndFadeIn animation only looks good when collapsing. For expanding,
+ // it looks like the editor is loading sluggishly. I tried animating the
+ // clipping bounds instead of the alpha value. But because the editors are very
+ // tall, this animation looked very similar to doing no animation at all. It
+ // wasn't worth the significant additional complexity.
+ if (!isCollapsed) {
+ EditorAnimator.getInstance().slideAndFadeIn(mCollapsibleSection,
+ startingHeight);
+ // We want to place the focus near the top of the screen now that a
+ // potentially focused editor is being collapsed.
+ EditorAnimator.placeFocusAtTopOfScreenAfterReLayout(mCollapsibleSection);
+ } else {
+ // When expanding we should scroll the expanded view onto the screen.
+ // Otherwise, user's may not notice that any expansion happened.
+ EditorAnimator.getInstance().scrollViewToTop(mAccountHeaderContainer);
+ mCollapsibleSection.requestFocus();
+ }
+ if (mListener != null) {
+ mListener.onEditorExpansionChanged();
+ }
+ updateAccountHeaderContentDescription();
+ }
+ });
+ mExpandAccountButton.setVisibility(View.VISIBLE);
+ mAccountHeaderContainer.setClickable(true);
+ } else {
+ mAccountHeaderContainer.setOnClickListener(null);
+ mExpandAccountButton.setVisibility(View.GONE);
+ mAccountHeaderContainer.setClickable(false);
+ }
+ }
+
+ public boolean isCollapsed() {
+ return mCollapsibleSection.getLayoutParams().height == 0;
+ }
+
+ public void setCollapsed(boolean isCollapsed) {
+ final LinearLayout.LayoutParams params
+ = (LayoutParams) mCollapsibleSection.getLayoutParams();
+ if (isCollapsed) {
+ params.height = 0;
+ mCollapsibleSection.setLayoutParams(params);
+ mExpandAccountButton.setImageResource(R.drawable.ic_menu_expander_minimized_holo_light);
+ } else {
+ params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+ mCollapsibleSection.setLayoutParams(params);
+ mExpandAccountButton.setImageResource(R.drawable.ic_menu_expander_maximized_holo_light);
+ }
+ }
+
+ protected void updateAccountHeaderContentDescription() {
+ final StringBuilder builder = new StringBuilder();
+ if (!TextUtils.isEmpty(mAccountType.getText())) {
+ builder.append(mAccountType.getText()).append('\n');
+ }
+ if (!TextUtils.isEmpty(mAccountName.getText())) {
+ builder.append(mAccountName.getText()).append('\n');
+ }
+ if (mExpandAccountButton.getVisibility() == View.VISIBLE) {
+ builder.append(getResources().getString(isCollapsed()
+ ? R.string.content_description_expand_editor
+ : R.string.content_description_collapse_editor));
+ }
+ mAccountHeaderContainer.setContentDescription(builder);
+ }
+
+ /**
* Set the internal state for this view, given a current
* {@link RawContactDelta} state and the {@link AccountType} that
* apply to that state.
*/
public abstract void setState(RawContactDelta state, AccountType source, ViewIdGenerator vig,
boolean isProfile);
-
- /* package */ void setExpanded(boolean value) {
- // only allow collapsing if we are one of several children
- final boolean newValue;
- if (getParent() instanceof ViewGroup && ((ViewGroup) getParent()).getChildCount() == 1) {
- newValue = true;
- } else {
- newValue = value;
- }
-
- if (newValue == mExpanded) return;
- mExpanded = newValue;
- mBody.setVisibility(newValue ? View.VISIBLE : View.GONE);
- mDivider.setVisibility(newValue ? View.GONE : View.VISIBLE);
- }
}
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index ed2520d..be02952 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -34,7 +34,6 @@
import android.content.Loader;
import android.database.Cursor;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.media.RingtoneManager;
import android.net.Uri;
@@ -100,6 +99,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
public class ContactEditorFragment extends Fragment implements
@@ -135,6 +135,7 @@
private static final String KEY_SEND_TO_VOICE_MAIL_STATE = "sendToVoicemailState";
private static final String KEY_CUSTOM_RINGTONE = "customRingtone";
private static final String KEY_ARE_PHONE_OPTIONS_CHANGEABLE = "arePhoneOptionsChangable";
+ private static final String KEY_EXPANDED_EDITORS = "expandedEditors";
public static final String SAVE_MODE_EXTRA_KEY = "saveMode";
@@ -277,6 +278,9 @@
// Used to temporarily store existing contact data during a rebind call (i.e. account switch)
private ImmutableList<RawContact> mRawContacts;
+ // Used to store which raw contact editors have been expanded. Keyed on raw contact ids.
+ private HashMap<Long, Boolean> mExpandedEditors = new HashMap<Long, Boolean>();
+
private AggregationSuggestionEngine mAggregationSuggestionEngine;
private long mAggregationSuggestionsRawContactId;
private View mAggregationSuggestionView;
@@ -523,6 +527,8 @@
mSendToVoicemailState = savedState.getBoolean(KEY_SEND_TO_VOICE_MAIL_STATE);
mCustomRingtone = savedState.getString(KEY_CUSTOM_RINGTONE);
mArePhoneOptionsChangable = savedState.getBoolean(KEY_ARE_PHONE_OPTIONS_CHANGEABLE);
+ mExpandedEditors = (HashMap<Long, Boolean>)
+ savedState.getSerializable(KEY_EXPANDED_EDITORS);
}
// mState can still be null because it may not have have finished loading before
@@ -585,6 +591,11 @@
mListener.onCustomEditContactActivityRequested(account, uri, null, false);
}
+ @Override
+ public void onEditorExpansionChanged() {
+ updatedExpandedEditorsMap();
+ }
+
private void bindEditorsForExistingContact(String displayName, boolean isUserProfile,
ImmutableList<RawContact> rawContacts) {
setEnabled(true);
@@ -836,36 +847,38 @@
if (!type.areContactsWritable()) {
editor = (BaseRawContactEditorView) inflater.inflate(
R.layout.raw_contact_readonly_editor_view, mContent, false);
- ((RawContactReadOnlyEditorView) editor).setListener(this);
} else {
editor = (RawContactEditorView) inflater.inflate(R.layout.raw_contact_editor_view,
mContent, false);
}
- if (mHasNewContact && !mNewLocalProfile) {
- final List<AccountWithDataSet> accounts =
- AccountTypeManager.getInstance(mContext).getAccounts(true);
- if (accounts.size() > 1) {
- addAccountSwitcher(mState.get(0), editor);
- } else {
- disableAccountSwitcher(editor);
- }
- } else {
- disableAccountSwitcher(editor);
+ editor.setListener(this);
+ final List<AccountWithDataSet> accounts = AccountTypeManager.getInstance(mContext)
+ .getAccounts(true);
+ if (mHasNewContact && !mNewLocalProfile && accounts.size() > 1) {
+ addAccountSwitcher(mState.get(0), editor);
}
editor.setEnabled(mEnabled);
+ if (mExpandedEditors.containsKey(rawContactId)) {
+ editor.setCollapsed(mExpandedEditors.get(rawContactId));
+ } else {
+ // By default, only the first editor will be expanded.
+ editor.setCollapsed(i != 0);
+ }
+
mContent.addView(editor);
editor.setState(rawContactDelta, type, mViewIdGenerator, isEditingUserProfile());
+ editor.setCollapsible(numRawContacts > 1);
// Set up the photo handler.
bindPhotoHandler(editor, type, mState);
- // If a new photo was chosen but not yet saved, we need to
- // update the thumbnail to reflect this.
- Bitmap bitmap = updatedBitmapForRawContact(rawContactId);
- if (bitmap != null) editor.setPhotoBitmap(bitmap);
+ // If a new photo was chosen but not yet saved, we need to update the UI to
+ // reflect this.
+ final Uri photoUri = updatedPhotoUriForRawContact(rawContactId);
+ if (photoUri != null) editor.setFullSizedPhoto(photoUri);
if (editor instanceof RawContactEditorView) {
final Activity activity = getActivity();
@@ -879,6 +892,8 @@
}
if (request == EditorListener.FIELD_CHANGED && !isEditingUserProfile()) {
acquireAggregationSuggestions(activity, rawContactEditor);
+ } else if (request == EditorListener.EDITOR_FOCUS_CHANGED) {
+ adjustNameFieldsHintDarkness(rawContactEditor);
}
}
@@ -902,9 +917,15 @@
phoneticNameEditor.setEditorListener(listener);
rawContactEditor.setAutoAddToDefaultGroup(mAutoAddToDefaultGroup);
+ final TextFieldsEditorView nickNameEditor =
+ rawContactEditor.getNickNameEditor();
+ nickNameEditor.setEditorListener(listener);
+
if (rawContactId == mAggregationSuggestionsRawContactId) {
acquireAggregationSuggestions(activity, rawContactEditor);
}
+
+ adjustNameFieldsHintDarkness(rawContactEditor);
}
}
@@ -919,44 +940,74 @@
// Activity can be null if we have been detached from the Activity
final Activity activity = getActivity();
if (activity != null) activity.invalidateOptionsMenu();
+
+ updatedExpandedEditorsMap();
}
/**
- * If we've stashed a temporary file containing a contact's new photo,
- * decode it and return the bitmap.
+ * Adjust how dark the hint text should be on all the names' text fields.
+ *
+ * @param rawContactEditor editor to update
+ */
+ private void adjustNameFieldsHintDarkness(RawContactEditorView rawContactEditor) {
+ // Check whether fields contain focus by calling findFocus() instead of hasFocus().
+ // The hasFocus() value is not necessarily up to date.
+ final boolean nameFieldsAreNotFocused
+ = rawContactEditor.getNameEditor().findFocus() == null
+ && rawContactEditor.getPhoneticNameEditor().findFocus() == null
+ && rawContactEditor.getNickNameEditor().findFocus() == null;
+ rawContactEditor.getNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
+ rawContactEditor.getPhoneticNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
+ rawContactEditor.getNickNameEditor().setHintColorDark(!nameFieldsAreNotFocused);
+ }
+
+ /**
+ * Update the values in {@link #mExpandedEditors}.
+ */
+ private void updatedExpandedEditorsMap() {
+ for (int i = 0; i < mContent.getChildCount(); i++) {
+ final View childView = mContent.getChildAt(i);
+ if (childView instanceof BaseRawContactEditorView) {
+ BaseRawContactEditorView childEditor = (BaseRawContactEditorView) childView;
+ mExpandedEditors.put(childEditor.getRawContactId(), childEditor.isCollapsed());
+ }
+ }
+ }
+
+ /**
+ * If we've stashed a temporary file containing a contact's new photo, return its URI.
* @param rawContactId identifies the raw-contact whose Bitmap we'll try to return.
- * @return Bitmap of photo for specified raw-contact, or null
- */
- private Bitmap updatedBitmapForRawContact(long rawContactId) {
- String path = mUpdatedPhotos.getString(String.valueOf(rawContactId));
- return path == null ? null : BitmapFactory.decodeFile(path);
+ * @return Uru of photo for specified raw-contact, or null
+ */
+ private Uri updatedPhotoUriForRawContact(long rawContactId) {
+ return (Uri) mUpdatedPhotos.get(String.valueOf(rawContactId));
}
private void bindPhotoHandler(BaseRawContactEditorView editor, AccountType type,
RawContactDeltaList state) {
final int mode;
+ final boolean showIsPrimaryOption;
if (type.areContactsWritable()) {
if (editor.hasSetPhoto()) {
- if (hasMoreThanOnePhoto()) {
- mode = PhotoActionPopup.Modes.PHOTO_ALLOW_PRIMARY;
- } else {
- mode = PhotoActionPopup.Modes.PHOTO_DISALLOW_PRIMARY;
- }
+ mode = PhotoActionPopup.Modes.WRITE_ABLE_PHOTO;
+ showIsPrimaryOption = hasMoreThanOnePhoto();
} else {
mode = PhotoActionPopup.Modes.NO_PHOTO;
+ showIsPrimaryOption = false;
}
+ } else if (editor.hasSetPhoto() && hasMoreThanOnePhoto()) {
+ mode = PhotoActionPopup.Modes.READ_ONLY_PHOTO;
+ showIsPrimaryOption = true;
} else {
- if (editor.hasSetPhoto() && hasMoreThanOnePhoto()) {
- mode = PhotoActionPopup.Modes.READ_ONLY_ALLOW_PRIMARY;
- } else {
- // Read-only and either no photo or the only photo ==> no options
- editor.getPhotoEditor().setEditorListener(null);
- return;
- }
+ // Read-only and either no photo or the only photo ==> no options
+ editor.getPhotoEditor().setEditorListener(null);
+ editor.getPhotoEditor().setShowPrimary(false);
+ return;
}
final PhotoHandler photoHandler = new PhotoHandler(mContext, editor, mode, state);
editor.getPhotoEditor().setEditorListener(
(PhotoHandler.PhotoEditorListener) photoHandler.getListener());
+ editor.getPhotoEditor().setShowPrimary(showIsPrimaryOption);
// Note a newly created raw contact gets some random negative ID, so any value is valid
// here. (i.e. don't check against -1 or anything.)
@@ -1005,7 +1056,11 @@
currentState.getAccountType(),
currentState.getDataSet());
final View accountView = editor.findViewById(R.id.account);
- final View anchorView = editor.findViewById(R.id.account_container);
+ final View anchorView = editor.findViewById(R.id.account_selector_container);
+ if (accountView == null) {
+ return;
+ }
+ anchorView.setVisibility(View.VISIBLE);
accountView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -1034,14 +1089,6 @@
});
}
- private void disableAccountSwitcher(BaseRawContactEditorView editor) {
- // Remove the pressed state from the account header because the user cannot switch accounts
- // on an existing contact
- final View accountView = editor.findViewById(R.id.account);
- accountView.setBackground(null);
- accountView.setEnabled(false);
- }
-
@Override
public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
inflater.inflate(R.menu.edit_contact, menu);
@@ -1060,6 +1107,8 @@
final MenuItem sendToVoiceMailMenu = menu.findItem(R.id.menu_send_to_voicemail);
final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone);
final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
+ deleteMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ deleteMenu.setIcon(R.drawable.ic_delete_white_24dp);
// Set visibility of menus
doneMenu.setVisible(false);
@@ -1101,6 +1150,7 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ case android.R.id.home:
case R.id.menu_done:
return save(SaveMode.CLOSE);
case R.id.menu_discard:
@@ -1429,7 +1479,7 @@
public static interface Listener {
/**
* Contact was not found, so somehow close this fragment. This is raised after a contact
- * is removed via Menu/Delete (unless it was a new contact)
+ * is removed via Menu/Delete
*/
void onContactNotFound();
@@ -1786,10 +1836,11 @@
outState.putBoolean(KEY_EXISTING_CONTACT_READY, mExistingContactDataReady);
outState.putParcelableArrayList(KEY_RAW_CONTACTS,
mRawContacts == null ?
- Lists.<RawContact> newArrayList() : Lists.newArrayList(mRawContacts));
+ Lists.<RawContact>newArrayList() : Lists.newArrayList(mRawContacts));
outState.putBoolean(KEY_SEND_TO_VOICE_MAIL_STATE, mSendToVoicemailState);
outState.putString(KEY_CUSTOM_RINGTONE, mCustomRingtone);
outState.putBoolean(KEY_ARE_PHONE_OPTIONS_CHANGEABLE, mArePhoneOptionsChangable);
+ outState.putSerializable(KEY_EXPANDED_EDITORS, mExpandedEditors);
super.onSaveInstanceState(outState);
}
@@ -1859,7 +1910,18 @@
}
if (requestingEditor != null) {
- requestingEditor.setPhotoBitmap(photo);
+ requestingEditor.setPhotoEntry(photo);
+ // Immediately set all other photos as non-primary. Otherwise the UI can display
+ // multiple photos as "Primary photo".
+ for (int i = 0; i < mContent.getChildCount(); i++) {
+ final View childView = mContent.getChildAt(i);
+ if (childView instanceof BaseRawContactEditorView
+ && childView != requestingEditor) {
+ final BaseRawContactEditorView rawContactEditor
+ = (BaseRawContactEditorView) childView;
+ rawContactEditor.getPhotoEditor().setSuperPrimary(false);
+ }
+ }
} else {
Log.w(TAG, "The contact that requested the photo is no longer present.");
}
@@ -1931,8 +1993,9 @@
final long loaderCurrentTime = SystemClock.elapsedRealtime();
Log.v(TAG, "Time needed for loading: " + (loaderCurrentTime-mLoaderStartTime));
if (!data.isLoaded()) {
- // Item has been deleted
+ // Item has been deleted. Close activity without saving again.
Log.i(TAG, "No contact found. Closing activity");
+ mStatus = Status.CLOSING;
if (mListener != null) mListener.onContactNotFound();
return;
}
@@ -2001,7 +2064,7 @@
public PhotoHandler(Context context, BaseRawContactEditorView editor, int photoMode,
RawContactDeltaList state) {
- super(context, editor.getPhotoEditor(), photoMode, false, state);
+ super(context, editor.getPhotoEditor().getChangeAnchorView(), photoMode, false, state);
mEditor = editor;
mRawContactId = editor.getRawContactId();
mPhotoEditorListener = new PhotoEditorListener();
@@ -2031,6 +2094,9 @@
if (request == EditorListener.REQUEST_PICK_PHOTO) {
onClick(mEditor.getPhotoEditor());
}
+ if (request == EditorListener.REQUEST_PICK_PRIMARY_PHOTO) {
+ useAsPrimaryChosen();
+ }
}
@Override
@@ -2042,8 +2108,7 @@
/**
* User has chosen to set the selected photo as the (super) primary photo
*/
- @Override
- public void onUseAsPrimaryChosen() {
+ public void useAsPrimaryChosen() {
// Set the IsSuperPrimary for each editor
int count = mContent.getChildCount();
for (int i = 0; i < count; i++) {
@@ -2063,7 +2128,7 @@
*/
@Override
public void onRemovePictureChosen() {
- mEditor.setPhotoBitmap(null);
+ mEditor.setPhotoEntry(null);
// Prevent bitmap from being restored if rotate the device.
// (only if we first chose a new photo before removing it)
diff --git a/src/com/android/contacts/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
index 7990309..73b950a 100644
--- a/src/com/android/contacts/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -40,6 +40,7 @@
*/
public void onRequest(int request);
+ public static final int REQUEST_PICK_PRIMARY_PHOTO = 0;
public static final int REQUEST_PICK_PHOTO = 1;
public static final int FIELD_CHANGED = 2;
public static final int FIELD_TURNED_EMPTY = 3;
@@ -48,6 +49,9 @@
// The editor has switched between different representations of the same
// data, e.g. from full name to structured name
public static final int EDITOR_FORM_CHANGED = 5;
+
+ // Focus has changed inside the editor.
+ public static final int EDITOR_FOCUS_CHANGED = 6;
}
/**
diff --git a/src/com/android/contacts/editor/EditorAnimator.java b/src/com/android/contacts/editor/EditorAnimator.java
index 7e85d8b..2e17e23 100644
--- a/src/com/android/contacts/editor/EditorAnimator.java
+++ b/src/com/android/contacts/editor/EditorAnimator.java
@@ -25,6 +25,7 @@
import android.view.ViewGroup;
import android.view.ViewParent;
import android.widget.LinearLayout;
+import android.widget.ScrollView;
import com.android.contacts.util.SchedulingUtils;
import com.google.common.collect.Lists;
@@ -91,7 +92,6 @@
mRunner.endOldAnimation();
target.setVisibility(View.VISIBLE);
target.setAlpha(0.0f);
- target.requestFocus();
SchedulingUtils.doAfterLayout(target, new Runnable() {
@Override
public void run() {
@@ -115,43 +115,7 @@
});
}
- public void expandOrganization(final View addOrganizationButton,
- final ViewGroup organizationSectionViewContainer) {
- mRunner.endOldAnimation();
- // Make the new controls visible and do one layout pass (so that we can measure)
- organizationSectionViewContainer.setVisibility(View.VISIBLE);
- organizationSectionViewContainer.setAlpha(0.0f);
- organizationSectionViewContainer.requestFocus();
- SchedulingUtils.doAfterLayout(addOrganizationButton, new Runnable() {
- @Override
- public void run() {
- // How many pixels extra do we need?
- final int offset = organizationSectionViewContainer.getHeight() -
- addOrganizationButton.getHeight();
- final List<Animator> animators = Lists.newArrayList();
-
- // Fade out
- final ObjectAnimator fadeOutAnimator = ObjectAnimator.ofFloat(
- addOrganizationButton, View.ALPHA, 1.0f, 0.0f);
- fadeOutAnimator.setDuration(200);
- animators.add(fadeOutAnimator);
-
- // Translations
- final List<View> viewsToMove = getViewsBelowOf(organizationSectionViewContainer);
- translateViews(animators, viewsToMove, -offset, 0.0f, 0, 200);
- // Fade in
- final ObjectAnimator fadeInAnimator = ObjectAnimator.ofFloat(
- organizationSectionViewContainer, View.ALPHA, 0.0f, 1.0f);
- fadeInAnimator.setDuration(200);
- fadeInAnimator.setStartDelay(200);
- animators.add(fadeInAnimator);
-
- mRunner.run(animators);
- }
- });
- }
-
- public void showAddFieldFooter(final View view) {
+ public void showFieldFooter(final View view) {
mRunner.endOldAnimation();
if (view.getVisibility() == View.VISIBLE) return;
// Make the new controls visible and do one layout pass (so that we can measure)
@@ -181,38 +145,55 @@
});
}
- public void hideAddFieldFooter(final View victim) {
- mRunner.endOldAnimation();
- if (victim.getVisibility() == View.GONE) return;
- final int offset = victim.getHeight();
-
- final List<View> viewsToMove = getViewsBelowOf(victim);
- final List<Animator> animators = Lists.newArrayList();
-
- // Fade out
- final ObjectAnimator fadeOutAnimator =
- ObjectAnimator.ofFloat(victim, View.ALPHA, 1.0f, 0.0f);
- fadeOutAnimator.setDuration(200);
- animators.add(fadeOutAnimator);
-
- // Translations
- translateViews(animators, viewsToMove, 0.0f, -offset, 100, 200);
-
- // Combine
- mRunner.run(animators, new AnimatorListenerAdapter() {
+ /**
+ * Smoothly scroll {@param targetView}'s parent ScrollView to the top of {@param targetView}.
+ */
+ public void scrollViewToTop(final View targetView) {
+ final ScrollView scrollView = getParentScrollView(targetView);
+ SchedulingUtils.doAfterLayout(scrollView, new Runnable() {
@Override
- public void onAnimationEnd(Animator animation) {
- // Clean up: Remove all the translations
- for (int i = 0; i < viewsToMove.size(); i++) {
- final View view = viewsToMove.get(i);
- view.setTranslationY(0.0f);
- }
-
- // Restore alpha (for next time), but hide the view for good now
- victim.setAlpha(1.0f);
- victim.setVisibility(View.GONE);
+ public void run() {
+ ScrollView scrollView = getParentScrollView(targetView);
+ scrollView.smoothScrollTo(0, offsetFromTopOfViewGroup(targetView, scrollView)
+ + scrollView.getScrollY());
}
});
+ // Clear the focused element so it doesn't interfere with scrolling.
+ View view = scrollView.findFocus();
+ if (view != null) {
+ view.clearFocus();
+ }
+ }
+
+ public static void placeFocusAtTopOfScreenAfterReLayout(final View view) {
+ // In order for the focus to be placed at the top of the Window, we need
+ // to wait for layout. Otherwise we don't know where the top of the screen is.
+ SchedulingUtils.doAfterLayout(view, new Runnable() {
+ @Override
+ public void run() {
+ EditorAnimator.getParentScrollView(view).clearFocus();
+ }
+ });
+ }
+
+ private int offsetFromTopOfViewGroup(View view, ViewGroup viewGroup) {
+ int viewLocation[] = new int[2];
+ int viewGroupLocation[] = new int[2];
+ viewGroup.getLocationOnScreen(viewGroupLocation);
+ view.getLocationOnScreen(viewLocation);
+ return viewLocation[1] - viewGroupLocation[1];
+ }
+
+ private static ScrollView getParentScrollView(View view) {
+ while (true) {
+ ViewParent parent = view.getParent();
+ if (parent instanceof ScrollView)
+ return (ScrollView) parent;
+ if (!(parent instanceof View))
+ throw new IllegalArgumentException(
+ "The editor should be contained inside a ScrollView.");
+ view = (View) parent;
+ }
}
/**
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index 4d9411f..246ee9c 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -52,7 +52,7 @@
*/
private String mNoDateString;
private int mPrimaryTextColor;
- private int mSecondaryTextColor;
+ private int mHintTextColor;
private Button mDateView;
@@ -75,7 +75,7 @@
Resources resources = mContext.getResources();
mPrimaryTextColor = resources.getColor(R.color.primary_text_color);
- mSecondaryTextColor = resources.getColor(R.color.secondary_text_color);
+ mHintTextColor = resources.getColor(R.color.editor_disabled_text_color);
mNoDateString = mContext.getString(R.string.event_edit_field_hint_text);
mDateView = (Button) findViewById(R.id.date_view);
@@ -113,6 +113,7 @@
mDateView.setEnabled(isEnabled() && !readOnly);
rebuildDateView();
+ updateEmptiness();
}
private void rebuildDateView() {
@@ -122,7 +123,7 @@
false /*Use the short DateFormat to ensure that it fits inside the EditText*/);
if (TextUtils.isEmpty(data)) {
mDateView.setText(mNoDateString);
- mDateView.setTextColor(mSecondaryTextColor);
+ mDateView.setTextColor(mHintTextColor);
setDeleteButtonVisible(false);
} else {
mDateView.setText(data);
@@ -255,7 +256,7 @@
public void clearAllFields() {
// Update UI
mDateView.setText(mNoDateString);
- mDateView.setTextColor(mSecondaryTextColor);
+ mDateView.setTextColor(mHintTextColor);
// Update state
final String column = getKind().fieldList.get(0).column;
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index bcea53d..e0d78b5 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -30,6 +30,7 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.CheckedTextView;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListPopupWindow;
import android.widget.ListView;
@@ -115,6 +116,9 @@
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final View itemView = super.getView(position, convertView, parent);
+ if (itemView == null) {
+ return null;
+ }
// Hide the checkable drawable. This assumes that the item views
// are CheckedTextView objects
@@ -122,6 +126,7 @@
if (!getItemIsCheckable(position)) {
checkedTextView.setCheckMarkDrawable(null);
}
+ checkedTextView.setTextColor(mPrimaryTextColor);
return checkedTextView;
}
@@ -144,7 +149,7 @@
private String mNoGroupString;
private int mPrimaryTextColor;
- private int mSecondaryTextColor;
+ private int mHintTextColor;
public GroupMembershipView(Context context) {
super(context);
@@ -159,7 +164,7 @@
super.onFinishInflate();
Resources resources = mContext.getResources();
mPrimaryTextColor = resources.getColor(R.color.primary_text_color);
- mSecondaryTextColor = resources.getColor(R.color.secondary_text_color);
+ mHintTextColor = resources.getColor(R.color.editor_disabled_text_color);
mNoGroupString = mContext.getString(R.string.group_edit_field_hint_text);
}
@@ -173,8 +178,8 @@
public void setKind(DataKind kind) {
mKind = kind;
- TextView kindTitle = (TextView) findViewById(R.id.kind_title);
- kindTitle.setText(getResources().getString(kind.titleRes).toUpperCase());
+ final ImageView imageView = (ImageView) findViewById(R.id.kind_icon);
+ imageView.setContentDescription(getResources().getString(kind.titleRes));
}
public void setGroupMetaData(Cursor groupMetaData) {
@@ -265,7 +270,7 @@
mGroupList.setEnabled(isEnabled());
if (sb.length() == 0) {
mGroupList.setText(mNoGroupString);
- mGroupList.setTextColor(mSecondaryTextColor);
+ mGroupList.setTextColor(mHintTextColor);
} else {
mGroupList.setText(sb);
mGroupList.setTextColor(mPrimaryTextColor);
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 261286e..3b10fe4 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -17,14 +17,27 @@
package com.android.contacts.editor;
import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.provider.Contacts.GroupMembership;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.Note;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.CommonDataKinds.Website;
import android.provider.ContactsContract.Data;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.TextView;
import com.android.contacts.R;
import com.android.contacts.editor.Editor.EditorListener;
@@ -44,10 +57,8 @@
public class KindSectionView extends LinearLayout implements EditorListener {
private static final String TAG = "KindSectionView";
- private TextView mTitle;
private ViewGroup mEditors;
- private View mAddFieldFooter;
- private String mTitleString;
+ private ImageView mIcon;
private DataKind mKind;
private RawContactDelta mState;
@@ -57,8 +68,6 @@
private LayoutInflater mInflater;
- private final ArrayList<Runnable> mRunWhenWindowFocused = new ArrayList<Runnable>(1);
-
public KindSectionView(Context context) {
this(context, null);
}
@@ -77,11 +86,7 @@
}
}
- if (enabled && !mReadOnly) {
- mAddFieldFooter.setVisibility(View.VISIBLE);
- } else {
- mAddFieldFooter.setVisibility(View.GONE);
- }
+ updateEmptyEditors(/* shouldAnimate = */ true);
}
public boolean isReadOnly() {
@@ -96,17 +101,8 @@
mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mTitle = (TextView) findViewById(R.id.kind_title);
mEditors = (ViewGroup) findViewById(R.id.kind_editors);
- mAddFieldFooter = findViewById(R.id.add_field_footer);
- mAddFieldFooter.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- // Setup click listener to add an empty field when the footer is clicked.
- mAddFieldFooter.setVisibility(View.GONE);
- addItem();
- }
- });
+ mIcon = (ImageView) findViewById(R.id.kind_icon);
}
@Override
@@ -126,7 +122,7 @@
// If a field has become empty or non-empty, then check if another row
// can be added dynamically.
if (request == FIELD_TURNED_EMPTY || request == FIELD_TURNED_NON_EMPTY) {
- updateAddFooterVisible(true);
+ updateEmptyEditors(/* shouldAnimate = */ true);
}
}
@@ -139,28 +135,24 @@
setId(mViewIdGenerator.getId(state, kind, null, ViewIdGenerator.NO_VIEW_INDEX));
// TODO: handle resources from remote packages
- mTitleString = (kind.titleRes == -1 || kind.titleRes == 0)
+ final String titleString = (kind.titleRes == -1 || kind.titleRes == 0)
? ""
: getResources().getString(kind.titleRes);
- mTitle.setText(mTitleString);
+ mIcon.setContentDescription(titleString);
+
+ mIcon.setImageDrawable(getMimeTypeDrawable(kind.mimeType));
+ if (mIcon.getDrawable() == null) {
+ mIcon.setContentDescription(null);
+ }
rebuildFromState();
- updateAddFooterVisible(false);
- updateSectionVisible();
- }
-
- public String getTitle() {
- return mTitleString;
- }
-
- public void setTitleVisible(boolean visible) {
- findViewById(R.id.kind_title_layout).setVisibility(visible ? View.VISIBLE : View.GONE);
+ updateEmptyEditors(/* shouldAnimate = */ false);
}
/**
* Build editors for all current {@link #mState} rows.
*/
- public void rebuildFromState() {
+ private void rebuildFromState() {
// Remove any existing editors
mEditors.removeAllViews();
@@ -222,48 +214,49 @@
return true;
}
- private void updateSectionVisible() {
- setVisibility(getEditorCount() != 0 ? VISIBLE : GONE);
- }
-
- protected void updateAddFooterVisible(boolean animate) {
- if (!mReadOnly && (mKind.typeOverallMax != 1)) {
- // First determine whether there are any existing empty editors.
- updateEmptyEditors();
- // If there are no existing empty editors and it's possible to add
- // another field, then make the "add footer" field visible.
- if (!hasEmptyEditor() && RawContactModifier.canInsert(mState, mKind)) {
- if (animate) {
- EditorAnimator.getInstance().showAddFieldFooter(mAddFieldFooter);
- } else {
- mAddFieldFooter.setVisibility(View.VISIBLE);
- }
- return;
- }
- }
- if (animate) {
- EditorAnimator.getInstance().hideAddFieldFooter(mAddFieldFooter);
- } else {
- mAddFieldFooter.setVisibility(View.GONE);
- }
- }
-
/**
* Updates the editors being displayed to the user removing extra empty
* {@link Editor}s, so there is only max 1 empty {@link Editor} view at a time.
*/
- private void updateEmptyEditors() {
- List<View> emptyEditors = getEmptyEditors();
+ private void updateEmptyEditors(boolean shouldAnimate) {
+
+ final List<View> emptyEditors = getEmptyEditors();
// If there is more than 1 empty editor, then remove it from the list of editors.
if (emptyEditors.size() > 1) {
- for (View emptyEditorView : emptyEditors) {
- // If no child {@link View}s are being focused on within
- // this {@link View}, then remove this empty editor.
+ for (final View emptyEditorView : emptyEditors) {
+ // If no child {@link View}s are being focused on within this {@link View}, then
+ // remove this empty editor. We can assume that at least one empty editor has focus.
+ // The only way to get two empty editors is by deleting characters from a non-empty
+ // editor, in which case this editor has focus.
if (emptyEditorView.findFocus() == null) {
- mEditors.removeView(emptyEditorView);
+ final Editor editor = (Editor) emptyEditorView;
+ if (shouldAnimate) {
+ editor.deleteEditor();
+ } else {
+ mEditors.removeView(emptyEditorView);
+ }
}
}
+ } else if (mKind == null) {
+ // There is nothing we can do.
+ return;
+ } else if (isReadOnly()) {
+ // We don't show empty editors for read only data kinds.
+ return;
+ } else if (mKind.typeOverallMax == getEditorCount() && mKind.typeOverallMax != 0) {
+ // We have already reached the maximum number of editors. Lets not add any more.
+ return;
+ } else if (emptyEditors.size() == 1) {
+ // We have already reached the maximum number of empty editors. Lets not add any more.
+ return;
+ } else {
+ final ValuesDelta values = RawContactModifier.insertChild(mState, mKind);
+ final View newField = createEditorView(values);
+ if (shouldAnimate) {
+ newField.setVisibility(View.GONE);
+ EditorAnimator.getInstance().showFieldFooter(newField);
+ }
}
}
@@ -281,105 +274,6 @@
return emptyEditorViews;
}
- /**
- * Returns true if one of the editors has all of its fields empty, or false
- * otherwise.
- */
- private boolean hasEmptyEditor() {
- return getEmptyEditors().size() > 0;
- }
-
- /**
- * Returns true if all editors are empty.
- */
- public boolean isEmpty() {
- for (int i = 0; i < mEditors.getChildCount(); i++) {
- View view = mEditors.getChildAt(i);
- if (!((Editor) view).isEmpty()) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Extends superclass implementation to also run tasks
- * enqueued by {@link #runWhenWindowFocused}.
- */
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- super.onWindowFocusChanged(hasWindowFocus);
- if (hasWindowFocus) {
- for (Runnable r: mRunWhenWindowFocused) {
- r.run();
- }
- mRunWhenWindowFocused.clear();
- }
- }
-
- /**
- * Depending on whether we are in the currently-focused window, either run
- * the argument immediately, or stash it until our window becomes focused.
- */
- private void runWhenWindowFocused(Runnable r) {
- if (hasWindowFocus()) {
- r.run();
- } else {
- mRunWhenWindowFocused.add(r);
- }
- }
-
- /**
- * Simple wrapper around {@link #runWhenWindowFocused}
- * to ensure that it runs in the UI thread.
- */
- private void postWhenWindowFocused(final Runnable r) {
- post(new Runnable() {
- @Override
- public void run() {
- runWhenWindowFocused(r);
- }
- });
- }
-
- public void addItem() {
- ValuesDelta values = null;
- // If this is a list, we can freely add. If not, only allow adding the first.
- if (mKind.typeOverallMax == 1) {
- if (getEditorCount() == 1) {
- return;
- }
-
- // If we already have an item, just make it visible
- ArrayList<ValuesDelta> entries = mState.getMimeEntries(mKind.mimeType);
- if (entries != null && entries.size() > 0) {
- values = entries.get(0);
- }
- }
-
- // Insert a new child, create its view and set its focus
- if (values == null) {
- values = RawContactModifier.insertChild(mState, mKind);
- }
-
- final View newField = createEditorView(values);
- if (newField instanceof Editor) {
- postWhenWindowFocused(new Runnable() {
- @Override
- public void run() {
- newField.requestFocus();
- ((Editor)newField).editNewlyAddedField();
- }
- });
- }
-
- // Hide the "add field" footer because there is now a blank field.
- mAddFieldFooter.setVisibility(View.GONE);
-
- // Ensure we are visible
- updateSectionVisible();
- }
-
public int getEditorCount() {
return mEditors.getChildCount();
}
@@ -387,4 +281,38 @@
public DataKind getKind() {
return mKind;
}
+
+ /**
+ * Return an icon that represents {@param mimeType}.
+ */
+ private Drawable getMimeTypeDrawable(String mimeType) {
+ switch (mimeType) {
+ case StructuredPostal.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_place_24dp);
+ case SipAddress.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_dialer_sip_black_24dp);
+ case Phone.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_phone_24dp);
+ case Im.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_message_24dp);
+ case Event.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_event_24dp);
+ case Email.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_email_24dp);
+ case Website.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_public_black_24dp);
+ case Photo.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_camera_alt_black_24dp);
+ case GroupMembership.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_people_black_24dp);
+ case Organization.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_business_black_24dp);
+ case Note.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_insert_comment_black_24dp);
+ case Relation.CONTENT_ITEM_TYPE:
+ return getResources().getDrawable(R.drawable.ic_circles_extended_black_24dp);
+ default:
+ return null;
+ }
+ }
}
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 0a33b6d..caf02b1 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -25,10 +25,9 @@
import android.os.Handler;
import android.text.Editable;
import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
import android.text.TextWatcher;
import android.util.AttributeSet;
-import android.view.Gravity;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -160,6 +159,9 @@
});
}
});
+
+ setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(),
+ (int) getResources().getDimension(R.dimen.editor_padding_between_editor_views));
}
@Override
@@ -237,6 +239,10 @@
mListener = listener;
}
+ protected EditorListener getEditorListener(){
+ return mListener;
+ }
+
@Override
public void setDeletable(boolean deletable) {
mIsDeletable = deletable;
@@ -274,7 +280,7 @@
* Build the current label state based on selected {@link EditType} and
* possible custom label string.
*/
- private void rebuildLabel() {
+ public void rebuildLabel() {
mEditTypeAdapter = new EditTypeAdapter(mContext);
mLabel.setAdapter(mEditTypeAdapter);
if (mEditTypeAdapter.hasCustomSelection()) {
@@ -295,12 +301,22 @@
// Notify listener if applicable
notifyEditorListener();
+
+ rebuildLabel();
}
protected void saveValue(String column, String value) {
mEntry.put(column, value);
}
+ /**
+ * Sub classes should call this at the end of {@link #setValues} once they finish changing
+ * isEmpty(). This is needed to fix b/18194655.
+ */
+ protected final void updateEmptiness() {
+ mWasEmpty = isEmpty();
+ }
+
protected void notifyEditorListener() {
if (mListener != null) {
mListener.onRequest(EditorListener.FIELD_CHANGED);
@@ -337,8 +353,9 @@
}
/**
- * Prepare this editor using the given {@link DataKind} for defining
- * structure and {@link ValuesDelta} describing the content to edit.
+ * Prepare this editor using the given {@link DataKind} for defining structure and
+ * {@link ValuesDelta} describing the content to edit. When overriding this, be careful
+ * to call {@link #updateEmptiness} at the end.
*/
@Override
public void setValues(DataKind kind, ValuesDelta entry, RawContactDelta state, boolean readOnly,
@@ -516,12 +533,18 @@
private class EditTypeAdapter extends ArrayAdapter<EditType> {
private final LayoutInflater mInflater;
private boolean mHasCustomSelection;
- private int mTextColor;
+ private int mTextColorHintUnfocused;
+ private int mTextColorDark;
+ private int mTextColorSecondary;
public EditTypeAdapter(Context context) {
super(context, 0);
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mTextColor = context.getResources().getColor(R.color.secondary_text_color);
+ mTextColorHintUnfocused = context.getResources().getColor(
+ R.color.editor_disabled_text_color);
+ mTextColorSecondary = context.getResources().getColor(R.color.secondary_text_color);
+ mTextColorDark = context.getResources().getColor(R.color.primary_text_color);
+
if (mType != null && mType.customColumn != null) {
@@ -542,8 +565,22 @@
@Override
public View getView(int position, View convertView, ViewGroup parent) {
- return createViewFromResource(
- position, convertView, parent, android.R.layout.simple_spinner_item);
+ final TextView view = createViewFromResource(
+ position, convertView, parent, R.layout.edit_simple_spinner_item);
+ // We don't want any background on this view. The background would obscure
+ // the spinner's background.
+ view.setBackground(null);
+ // The text color should be a very light hint color when unfocused and empty. When
+ // focused and empty, use a less light hint color. When non-empty, use a dark non-hint
+ // color.
+ if (!LabeledEditorView.this.isEmpty()) {
+ view.setTextColor(mTextColorDark);
+ } else if (LabeledEditorView.this.hasFocus()) {
+ view.setTextColor(mTextColorSecondary);
+ } else {
+ view.setTextColor(mTextColorHintUnfocused);
+ }
+ return view;
}
@Override
@@ -552,17 +589,15 @@
position, convertView, parent, android.R.layout.simple_spinner_dropdown_item);
}
- private View createViewFromResource(int position, View convertView, ViewGroup parent,
+ private TextView createViewFromResource(int position, View convertView, ViewGroup parent,
int resource) {
TextView textView;
if (convertView == null) {
textView = (TextView) mInflater.inflate(resource, parent, false);
- textView.setAllCaps(true);
- textView.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
- textView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
- textView.setTextColor(mTextColor);
- textView.setEllipsize(TruncateAt.MIDDLE);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimension(
+ R.dimen.editor_form_text_size));
+ textView.setTextColor(mTextColorDark);
} else {
textView = (TextView) convertView;
}
diff --git a/src/com/android/contacts/editor/PhoneticNameEditorView.java b/src/com/android/contacts/editor/PhoneticNameEditorView.java
index 69e0719..e645687 100644
--- a/src/com/android/contacts/editor/PhoneticNameEditorView.java
+++ b/src/com/android/contacts/editor/PhoneticNameEditorView.java
@@ -108,6 +108,7 @@
entry = new PhoneticValuesDelta(entry);
}
super.setValues(kind, entry, state, readOnly, vig);
+ updateEmptiness();
}
@Override
@@ -150,4 +151,12 @@
return !TextUtils.isEmpty(family) || !TextUtils.isEmpty(middle)
|| !TextUtils.isEmpty(given);
}
+
+ /** {@inheritDoc} */
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ // Remove padding below this view.
+ setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
+ }
}
diff --git a/src/com/android/contacts/editor/PhotoActionPopup.java b/src/com/android/contacts/editor/PhotoActionPopup.java
index 9903880..14b195b 100644
--- a/src/com/android/contacts/editor/PhotoActionPopup.java
+++ b/src/com/android/contacts/editor/PhotoActionPopup.java
@@ -40,8 +40,6 @@
* Bitmask flags to specify which actions should be presented to the user.
*/
public static final class Flags {
- /** If set, show choice to use as primary photo. */
- public static final int ALLOW_PRIMARY = 1;
/** If set, show choice to remove photo. */
public static final int REMOVE_PHOTO = 2;
/** If set, show choices to take a picture with the camera, or pick one from the gallery. */
@@ -59,14 +57,8 @@
public static final class Modes {
public static final int NO_PHOTO =
Flags.TAKE_OR_PICK_PHOTO;
- public static final int READ_ONLY_ALLOW_PRIMARY =
- Flags.ALLOW_PRIMARY;
- public static final int PHOTO_DISALLOW_PRIMARY =
- Flags.REMOVE_PHOTO |
- Flags.TAKE_OR_PICK_PHOTO |
- Flags.TAKE_OR_PICK_PHOTO_REPLACE_WORDING;
- public static final int PHOTO_ALLOW_PRIMARY =
- Flags.ALLOW_PRIMARY |
+ public static final int READ_ONLY_PHOTO = 0;
+ public static final int WRITE_ABLE_PHOTO =
Flags.REMOVE_PHOTO |
Flags.TAKE_OR_PICK_PHOTO |
Flags.TAKE_OR_PICK_PHOTO_REPLACE_WORDING;
@@ -77,11 +69,6 @@
// Build choices, depending on the current mode. We assume this Dialog is never called
// if there are NO choices (e.g. a read-only picture is already super-primary)
final ArrayList<ChoiceListItem> choices = new ArrayList<ChoiceListItem>(4);
- // Use as Primary
- if ((mode & Flags.ALLOW_PRIMARY) > 0) {
- choices.add(new ChoiceListItem(ChoiceListItem.ID_USE_AS_PRIMARY,
- context.getString(R.string.use_photo_as_primary)));
- }
// Remove
if ((mode & Flags.REMOVE_PHOTO) > 0) {
choices.add(new ChoiceListItem(ChoiceListItem.ID_REMOVE,
@@ -109,9 +96,6 @@
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final ChoiceListItem choice = choices.get(position);
switch (choice.getId()) {
- case ChoiceListItem.ID_USE_AS_PRIMARY:
- listener.onUseAsPrimaryChosen();
- break;
case ChoiceListItem.ID_REMOVE:
listener.onRemovePictureChosen();
break;
@@ -144,7 +128,6 @@
private final int mId;
private final String mCaption;
- public static final int ID_USE_AS_PRIMARY = 0;
public static final int ID_TAKE_PHOTO = 1;
public static final int ID_PICK_PHOTO = 2;
public static final int ID_REMOVE = 3;
@@ -165,7 +148,6 @@
}
public interface Listener {
- void onUseAsPrimaryChosen();
void onRemovePictureChosen();
void onTakePhotoChosen();
void onPickFromGalleryChosen();
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index a74e159..7c7cf66 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -19,13 +19,19 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.DisplayPhoto;
import android.util.AttributeSet;
import android.view.View;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.RadioButton;
import com.android.contacts.R;
+import com.android.contacts.common.ContactPhotoManager.DefaultImageProvider;
+import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.model.RawContactDelta;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactsUtils;
@@ -39,11 +45,12 @@
public class PhotoEditorView extends LinearLayout implements Editor {
private ImageView mPhotoImageView;
- private View mFrameView;
+ private Button mChangeButton;
+ private RadioButton mPrimaryCheckBox;
private ValuesDelta mEntry;
private EditorListener mListener;
- private View mTriangleAffordance;
+ private ContactPhotoManager mContactPhotoManager;
private boolean mHasSetPhoto = false;
private boolean mReadOnly;
@@ -59,7 +66,6 @@
@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
- mFrameView.setEnabled(enabled);
}
@Override
@@ -72,14 +78,28 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- mTriangleAffordance = findViewById(R.id.photo_triangle_affordance);
+ mContactPhotoManager = ContactPhotoManager.getInstance(mContext);
mPhotoImageView = (ImageView) findViewById(R.id.photo);
- mFrameView = findViewById(R.id.frame);
- mFrameView.setOnClickListener(new OnClickListener() {
+ mPrimaryCheckBox = (RadioButton) findViewById(R.id.primary_checkbox);
+ mChangeButton = (Button) findViewById(R.id.change_button);
+ mPrimaryCheckBox = (RadioButton) findViewById(R.id.primary_checkbox);
+ if (mChangeButton != null) {
+ mChangeButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mListener != null) {
+ mListener.onRequest(EditorListener.REQUEST_PICK_PHOTO);
+ }
+ }
+ });
+ }
+ // Turn off own state management. We do this ourselves on rotation.
+ mPrimaryCheckBox.setSaveEnabled(false);
+ mPrimaryCheckBox.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (mListener != null) {
- mListener.onRequest(EditorListener.REQUEST_PICK_PHOTO);
+ mListener.onRequest(EditorListener.REQUEST_PICK_PRIMARY_PHOTO);
}
}
});
@@ -100,6 +120,8 @@
setId(vig.getId(state, kind, values, 0));
+ mPrimaryCheckBox.setChecked(values != null && values.isSuperPrimary());
+
if (values != null) {
// Try decoding photo if actual entry
final byte[] photoBytes = values.getAsByteArray(Photo.PHOTO);
@@ -108,9 +130,22 @@
photoBytes.length);
mPhotoImageView.setImageBitmap(photo);
- mFrameView.setEnabled(isEnabled());
mHasSetPhoto = true;
mEntry.setFromTemplate(false);
+
+ if (values.getAfter() == null || values.getAfter().get(Photo.PHOTO) == null) {
+ // If the user hasn't updated the PHOTO value, then PHOTO_FILE_ID may contain
+ // a reference to a larger version of PHOTO that we can bind to the UI.
+ // Otherwise, we need to wait for a call to #setFullSizedPhoto() to update
+ // our full sized image.
+ final Integer photoFileId = values.getAsInteger(Photo.PHOTO_FILE_ID);
+ if (photoFileId != null) {
+ final Uri photoUri = DisplayPhoto.CONTENT_URI.buildUpon()
+ .appendPath(photoFileId.toString()).build();
+ setFullSizedPhoto(photoUri);
+ }
+ }
+
} else {
resetDefault();
}
@@ -120,6 +155,14 @@
}
/**
+ * Whether to display a "Primary photo" RadioButton. This is only needed if there are multiple
+ * candidate photos.
+ */
+ public void setShowPrimary(boolean showPrimaryCheckBox) {
+ mPrimaryCheckBox.setVisibility(showPrimaryCheckBox ? View.VISIBLE : View.GONE);
+ }
+
+ /**
* Return true if a valid {@link Photo} has been set.
*/
public boolean hasSetPhoto() {
@@ -127,10 +170,10 @@
}
/**
- * Assign the given {@link Bitmap} as the new value, updating UI and
- * readying for persisting through {@link ValuesDelta}.
+ * Assign the given {@link Bitmap} as the new value for the sake of building
+ * {@link ValuesDelta}. We may as well bind a thumbnail to the UI while we are at it.
*/
- public void setPhotoBitmap(Bitmap photo) {
+ public void setPhotoEntry(Bitmap photo) {
if (photo == null) {
// Clear any existing photo and return
mEntry.put(Photo.PHOTO, (byte[])null);
@@ -138,8 +181,10 @@
return;
}
- mPhotoImageView.setImageBitmap(photo);
- mFrameView.setEnabled(isEnabled());
+ final int size = ContactsUtils.getThumbnailSize(getContext());
+ final Bitmap scaled = Bitmap.createScaledBitmap(photo, size, size, false);
+
+ mPhotoImageView.setImageBitmap(scaled);
mHasSetPhoto = true;
mEntry.setFromTemplate(false);
@@ -152,10 +197,29 @@
// code all over the place, because we don't have to test whether
// there is a change in EITHER the delta-list OR a changed photo...
// this way, there is always a change in the delta-list.
- final int size = ContactsUtils.getThumbnailSize(getContext());
- final Bitmap scaled = Bitmap.createScaledBitmap(photo, size, size, false);
final byte[] compressed = ContactPhotoUtils.compressBitmap(scaled);
- if (compressed != null) mEntry.setPhoto(compressed);
+ if (compressed != null) {
+ mEntry.setPhoto(compressed);
+ }
+ }
+
+ /**
+ * Bind the {@param photoUri}'s photo to editor's UI. This doesn't affect {@link ValuesDelta}.
+ */
+ public void setFullSizedPhoto(Uri photoUri) {
+ if (photoUri != null) {
+ final DefaultImageProvider fallbackToPreviousImage = new DefaultImageProvider() {
+ @Override
+ public void applyDefaultImage(ImageView view, int extent, boolean darkTheme,
+ DefaultImageRequest defaultImageRequest) {
+ // Before we finish setting the full sized image, don't change the current
+ // image that is set in any way.
+ }
+ };
+ mContactPhotoManager.loadPhoto(mPhotoImageView, photoUri,
+ mPhotoImageView.getWidth(), /* darkTheme = */ false, /* isCircular = */ false,
+ /* defaultImageRequest = */ null, fallbackToPreviousImage);
+ }
}
/**
@@ -169,7 +233,6 @@
// Invalid photo, show default "add photo" place-holder
mPhotoImageView.setImageDrawable(
ContactPhotoManager.getDefaultAvatarDrawableForContact(getResources(), false, null));
- mFrameView.setEnabled(!mReadOnly && isEnabled());
mHasSetPhoto = false;
mEntry.setFromTemplate(true);
}
@@ -178,10 +241,6 @@
@Override
public void setEditorListener(EditorListener listener) {
mListener = listener;
-
- final boolean isPushable = listener != null;
- mTriangleAffordance.setVisibility(isPushable ? View.VISIBLE : View.INVISIBLE);
- mFrameView.setVisibility(isPushable ? View.VISIBLE : View.INVISIBLE);
}
@Override
@@ -203,4 +262,11 @@
public void clearAllFields() {
resetDefault();
}
+
+ /**
+ * The change drop down menu should be anchored to this view.
+ */
+ public View getChangeAnchorView() {
+ return mChangeButton;
+ }
}
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 39fe95a..ca15bfa 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -21,7 +21,7 @@
import android.os.Bundle;
import android.os.Parcelable;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Nickname;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.Contacts;
@@ -29,13 +29,8 @@
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.PopupMenu;
import android.widget.TextView;
import com.android.contacts.GroupMetaDataLoader;
@@ -46,6 +41,7 @@
import com.android.contacts.common.model.RawContactDelta;
import com.android.contacts.common.model.ValuesDelta;
import com.android.contacts.common.model.RawContactModifier;
+
import com.google.common.base.Objects;
import java.util.ArrayList;
@@ -62,27 +58,25 @@
* {@link RawContactModifier} to ensure that {@link AccountType} are enforced.
*/
public class RawContactEditorView extends BaseRawContactEditorView {
- private static final String KEY_ORGANIZATION_VIEW_EXPANDED = "organizationViewExpanded";
private static final String KEY_SUPER_INSTANCE_STATE = "superInstanceState";
private LayoutInflater mInflater;
private StructuredNameEditorView mName;
private PhoneticNameEditorView mPhoneticName;
- private GroupMembershipView mGroupMembershipView;
+ private TextFieldsEditorView mNickName;
- private ViewGroup mOrganizationSectionViewContainer;
- private View mAddOrganizationButton;
- private View mOrganizationView;
- private boolean mOrganizationViewExpanded = false;
+ private GroupMembershipView mGroupMembershipView;
private ViewGroup mFields;
- private ImageView mAccountIcon;
- private TextView mAccountTypeTextView;
- private TextView mAccountNameTextView;
+ private View mAccountSelector;
+ private TextView mAccountSelectorTypeTextView;
+ private TextView mAccountSelectorNameTextView;
- private Button mAddFieldButton;
+ private View mAccountHeader;
+ private TextView mAccountHeaderTypeTextView;
+ private TextView mAccountHeaderNameTextView;
private long mRawContactId = -1;
private boolean mAutoAddToDefaultGroup = true;
@@ -90,8 +84,6 @@
private DataKind mGroupMembershipKind;
private RawContactDelta mState;
- private boolean mPhoneticNameAdded;
-
public RawContactEditorView(Context context) {
super(context);
}
@@ -127,8 +119,6 @@
if (mGroupMembershipView != null) {
mGroupMembershipView.setEnabled(enabled);
}
-
- mAddFieldButton.setEnabled(enabled);
}
@Override
@@ -143,32 +133,22 @@
mPhoneticName = (PhoneticNameEditorView)findViewById(R.id.edit_phonetic_name);
mPhoneticName.setDeletable(false);
+ mNickName = (TextFieldsEditorView)findViewById(R.id.edit_nick_name);
+
mFields = (ViewGroup)findViewById(R.id.sect_fields);
- mAccountIcon = (ImageView) findViewById(R.id.account_icon);
- mAccountTypeTextView = (TextView) findViewById(R.id.account_type);
- mAccountNameTextView = (TextView) findViewById(R.id.account_name);
+ mAccountHeader = findViewById(R.id.account_header_container);
+ mAccountHeaderTypeTextView = (TextView) findViewById(R.id.account_type);
+ mAccountHeaderNameTextView = (TextView) findViewById(R.id.account_name);
- mOrganizationView = mInflater.inflate(
- R.layout.organization_editor_view_switcher, mFields, false);
- mAddOrganizationButton = mOrganizationView.findViewById(
- R.id.add_organization_button);
- mOrganizationSectionViewContainer =
- (ViewGroup) mOrganizationView.findViewById(R.id.container);
-
- mAddFieldButton = (Button) findViewById(R.id.button_add_field);
- mAddFieldButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- showAddInformationPopupWindow();
- }
- });
+ mAccountSelector = findViewById(R.id.account_selector_container);
+ mAccountSelectorTypeTextView = (TextView) findViewById(R.id.account_type_selector);
+ mAccountSelectorNameTextView = (TextView) findViewById(R.id.account_name_selector);
}
@Override
protected Parcelable onSaveInstanceState() {
Bundle bundle = new Bundle();
- bundle.putBoolean(KEY_ORGANIZATION_VIEW_EXPANDED, mOrganizationViewExpanded);
// super implementation of onSaveInstanceState returns null
bundle.putParcelable(KEY_SUPER_INSTANCE_STATE, super.onSaveInstanceState());
return bundle;
@@ -178,20 +158,10 @@
protected void onRestoreInstanceState(Parcelable state) {
if (state instanceof Bundle) {
Bundle bundle = (Bundle) state;
- mOrganizationViewExpanded = bundle.getBoolean(KEY_ORGANIZATION_VIEW_EXPANDED);
- if (mOrganizationViewExpanded) {
- // we have to manually perform the expansion here because
- // onRestoreInstanceState is called after setState. So at the point
- // of the creation of the organization view, mOrganizationViewExpanded
- // does not have the correct value yet.
- mOrganizationSectionViewContainer.setVisibility(VISIBLE);
- mAddOrganizationButton.setVisibility(GONE);
- }
super.onRestoreInstanceState(bundle.getParcelable(KEY_SUPER_INSTANCE_STATE));
return;
}
super.onRestoreInstanceState(state);
- return;
}
/**
@@ -213,9 +183,8 @@
setId(vig.getId(state, null, null, ViewIdGenerator.NO_VIEW_INDEX));
- // Make sure we have a StructuredName and Organization
+ // Make sure we have a StructuredName
RawContactModifier.ensureKindExists(state, type, StructuredName.CONTENT_ITEM_TYPE);
- RawContactModifier.ensureKindExists(state, type, Organization.CONTENT_ITEM_TYPE);
mRawContactId = state.getRawContactId();
@@ -223,13 +192,13 @@
if (isProfile) {
String accountName = state.getAccountName();
if (TextUtils.isEmpty(accountName)) {
- mAccountNameTextView.setVisibility(View.GONE);
- mAccountTypeTextView.setText(R.string.local_profile_title);
+ mAccountHeaderNameTextView.setVisibility(View.GONE);
+ mAccountHeaderTypeTextView.setText(R.string.local_profile_title);
} else {
CharSequence accountType = type.getDisplayLabel(mContext);
- mAccountTypeTextView.setText(mContext.getString(R.string.external_profile_title,
+ mAccountHeaderTypeTextView.setText(mContext.getString(R.string.external_profile_title,
accountType));
- mAccountNameTextView.setText(accountName);
+ mAccountHeaderNameTextView.setText(accountName);
}
} else {
String accountName = state.getAccountName();
@@ -238,17 +207,27 @@
accountType = mContext.getString(R.string.account_phone);
}
if (!TextUtils.isEmpty(accountName)) {
- mAccountNameTextView.setVisibility(View.VISIBLE);
- mAccountNameTextView.setText(
+ mAccountHeaderNameTextView.setVisibility(View.VISIBLE);
+ mAccountHeaderNameTextView.setText(
mContext.getString(R.string.from_account_format, accountName));
} else {
// Hide this view so the other text view will be centered vertically
- mAccountNameTextView.setVisibility(View.GONE);
+ mAccountHeaderNameTextView.setVisibility(View.GONE);
}
- mAccountTypeTextView.setText(
+ mAccountHeaderTypeTextView.setText(
mContext.getString(R.string.account_type_format, accountType));
}
- mAccountIcon.setImageDrawable(type.getDisplayIcon(mContext));
+ updateAccountHeaderContentDescription();
+
+ // The account selector and header are both used to display the same information.
+ mAccountSelectorTypeTextView.setText(mAccountHeaderTypeTextView.getText());
+ mAccountSelectorTypeTextView.setVisibility(mAccountHeaderTypeTextView.getVisibility());
+ mAccountSelectorNameTextView.setText(mAccountHeaderNameTextView.getText());
+ mAccountSelectorNameTextView.setVisibility(mAccountHeaderNameTextView.getVisibility());
+ // Showing the account header at the same time as the account selector drop down is
+ // confusing. They should be mutually exclusive.
+ mAccountHeader.setVisibility(mAccountSelector.getVisibility() == View.GONE
+ ? View.VISIBLE : View.GONE);
// Show photo editor when supported
RawContactModifier.ensureKindExists(state, type, Photo.CONTENT_ITEM_TYPE);
@@ -286,6 +265,22 @@
mPhoneticName.setValues(
type.getKindForMimetype(DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME),
primary, state, false, vig);
+ // It is useful to use Nickname outside of a KindSectionView so that we can treat it
+ // as a part of StructuredName's fake KindSectionView, even though it uses a
+ // different CP2 mime-type. We do a bit of extra work below to make this possible.
+ final DataKind nickNameKind = type.getKindForMimetype(Nickname.CONTENT_ITEM_TYPE);
+ if (nickNameKind != null) {
+ ValuesDelta primaryNickNameEntry = state.getPrimaryEntry(nickNameKind.mimeType);
+ if (primaryNickNameEntry == null) {
+ primaryNickNameEntry = RawContactModifier.insertChild(state, nickNameKind);
+ }
+ mNickName.setValues(nickNameKind, primaryNickNameEntry, state, false, vig);
+ mNickName.setDeletable(false);
+ } else {
+ mPhoneticName.setPadding(0, 0, 0, (int) getResources().getDimension(
+ R.dimen.editor_padding_between_editor_views));
+ mNickName.setVisibility(View.GONE);
+ }
} else if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
// Handle special case editor for photos
final ValuesDelta primary = state.getPrimaryEntry(mimeType);
@@ -293,38 +288,13 @@
} else if (GroupMembership.CONTENT_ITEM_TYPE.equals(mimeType)) {
if (mGroupMembershipView != null) {
mGroupMembershipView.setState(state);
+ mFields.addView(mGroupMembershipView);
}
- } else if (Organization.CONTENT_ITEM_TYPE.equals(mimeType)) {
- // Create the organization section
- final KindSectionView section = (KindSectionView) mInflater.inflate(
- R.layout.item_kind_section, mFields, false);
- section.setTitleVisible(false);
- section.setEnabled(isEnabled());
- section.setState(kind, state, false, vig);
-
- // If there is organization info for the contact already, display it
- if (!section.isEmpty()) {
- mFields.addView(section);
- } else {
- // Otherwise provide the user with an "add organization" button that shows the
- // EditText fields only when clicked
- mOrganizationSectionViewContainer.removeAllViews();
- mOrganizationSectionViewContainer.addView(section);
-
- // Setup the click listener for the "add organization" button
- mAddOrganizationButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- // Once the user expands the organization field, the user cannot
- // collapse them again.
- EditorAnimator.getInstance().expandOrganization(mAddOrganizationButton,
- mOrganizationSectionViewContainer);
- mOrganizationViewExpanded = true;
- }
- });
-
- mFields.addView(mOrganizationView);
- }
+ } else if (DataKind.PSEUDO_MIME_TYPE_DISPLAY_NAME.equals(mimeType)
+ || DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME.equals(mimeType)
+ || Nickname.CONTENT_ITEM_TYPE.equals(mimeType)) {
+ // Don't create fields for each of these mime-types. They are handled specially.
+ continue;
} else {
// Otherwise use generic section-based editors
if (kind.fieldList == null) continue;
@@ -336,18 +306,7 @@
}
}
- if (mGroupMembershipView != null) {
- mFields.addView(mGroupMembershipView);
- }
-
- updatePhoneticNameVisibility();
-
addToDefaultGroupIfNeeded();
-
-
- final int sectionCount = getSectionViewsWithoutFields().size();
- mAddFieldButton.setVisibility(sectionCount > 0 ? View.VISIBLE : View.GONE);
- mAddFieldButton.setEnabled(isEnabled());
}
@Override
@@ -431,89 +390,12 @@
return mPhoneticName;
}
- private void updatePhoneticNameVisibility() {
- boolean showByDefault =
- getContext().getResources().getBoolean(R.bool.config_editor_include_phonetic_name);
-
- if (showByDefault || mPhoneticName.hasData() || mPhoneticNameAdded) {
- mPhoneticName.setVisibility(View.VISIBLE);
- } else {
- mPhoneticName.setVisibility(View.GONE);
- }
+ public TextFieldsEditorView getNickNameEditor() {
+ return mNickName;
}
@Override
public long getRawContactId() {
return mRawContactId;
}
-
- /**
- * Return a list of KindSectionViews that have no fields yet...
- * these are candidates to have fields added in
- * {@link #showAddInformationPopupWindow()}
- */
- private ArrayList<KindSectionView> getSectionViewsWithoutFields() {
- final ArrayList<KindSectionView> fields =
- new ArrayList<KindSectionView>(mFields.getChildCount());
- for (int i = 0; i < mFields.getChildCount(); i++) {
- View child = mFields.getChildAt(i);
- if (child instanceof KindSectionView) {
- final KindSectionView sectionView = (KindSectionView) child;
- // If the section is already visible (has 1 or more editors), then don't offer the
- // option to add this type of field in the popup menu
- if (sectionView.getEditorCount() > 0) {
- continue;
- }
- DataKind kind = sectionView.getKind();
- // not a list and already exists? ignore
- if ((kind.typeOverallMax == 1) && sectionView.getEditorCount() != 0) {
- continue;
- }
- if (DataKind.PSEUDO_MIME_TYPE_DISPLAY_NAME.equals(kind.mimeType)) {
- continue;
- }
-
- if (DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME.equals(kind.mimeType)
- && mPhoneticName.getVisibility() == View.VISIBLE) {
- continue;
- }
-
- fields.add(sectionView);
- }
- }
- return fields;
- }
-
- private void showAddInformationPopupWindow() {
- final ArrayList<KindSectionView> fields = getSectionViewsWithoutFields();
- final PopupMenu popupMenu = new PopupMenu(getContext(), mAddFieldButton);
- final Menu menu = popupMenu.getMenu();
- for (int i = 0; i < fields.size(); i++) {
- menu.add(Menu.NONE, i, Menu.NONE, fields.get(i).getTitle());
- }
-
- popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- final KindSectionView view = fields.get(item.getItemId());
- if (DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME.equals(view.getKind().mimeType)) {
- mPhoneticNameAdded = true;
- updatePhoneticNameVisibility();
- mPhoneticName.requestFocus();
- } else {
- view.addItem();
- }
-
- // If this was the last section without an entry, we just added one, and therefore
- // there's no reason to show the button.
- if (fields.size() == 1) {
- mAddFieldButton.setVisibility(View.GONE);
- }
-
- return true;
- }
- });
-
- popupMenu.show();
- }
}
diff --git a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
index 36e96a2..477cbd3 100644
--- a/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
+++ b/src/com/android/contacts/editor/RawContactReadOnlyEditorView.java
@@ -19,7 +19,7 @@
import android.content.ContentUris;
import android.content.Context;
import android.content.res.Resources;
-import android.net.Uri;
+import android.graphics.drawable.Drawable;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Photo;
@@ -35,7 +35,6 @@
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
-import android.widget.Toast;
import com.android.contacts.R;
import com.android.contacts.common.GeoUtil;
@@ -59,22 +58,14 @@
private Button mEditExternallyButton;
private ViewGroup mGeneral;
- private View mAccountContainer;
- private ImageView mAccountIcon;
- private TextView mAccountTypeTextView;
- private TextView mAccountNameTextView;
+ private TextView mAccountHeaderTypeTextView;
+ private TextView mAccountHeaderNameTextView;
private String mAccountName;
private String mAccountType;
private String mDataSet;
private long mRawContactId = -1;
- private Listener mListener;
-
- public interface Listener {
- void onExternalEditorRequest(AccountWithDataSet account, Uri uri);
- }
-
public RawContactReadOnlyEditorView(Context context) {
super(context);
}
@@ -83,9 +74,6 @@
super(context, attrs);
}
- public void setListener(Listener listener) {
- mListener = listener;
- }
/** {@inheritDoc} */
@Override
@@ -100,10 +88,8 @@
mEditExternallyButton.setOnClickListener(this);
mGeneral = (ViewGroup)findViewById(R.id.sect_general);
- mAccountContainer = findViewById(R.id.account_container);
- mAccountIcon = (ImageView) findViewById(R.id.account_icon);
- mAccountTypeTextView = (TextView) findViewById(R.id.account_type);
- mAccountNameTextView = (TextView) findViewById(R.id.account_name);
+ mAccountHeaderTypeTextView = (TextView) findViewById(R.id.account_type);
+ mAccountHeaderNameTextView = (TextView) findViewById(R.id.account_name);
}
/**
@@ -130,13 +116,13 @@
if (isProfile) {
if (TextUtils.isEmpty(mAccountName)) {
- mAccountNameTextView.setVisibility(View.GONE);
- mAccountTypeTextView.setText(R.string.local_profile_title);
+ mAccountHeaderNameTextView.setVisibility(View.GONE);
+ mAccountHeaderTypeTextView.setText(R.string.local_profile_title);
} else {
CharSequence accountType = type.getDisplayLabel(mContext);
- mAccountTypeTextView.setText(mContext.getString(R.string.external_profile_title,
+ mAccountHeaderTypeTextView.setText(mContext.getString(R.string.external_profile_title,
accountType));
- mAccountNameTextView.setText(mAccountName);
+ mAccountHeaderNameTextView.setText(mAccountName);
}
} else {
CharSequence accountType = type.getDisplayLabel(mContext);
@@ -144,23 +130,20 @@
accountType = mContext.getString(R.string.account_phone);
}
if (!TextUtils.isEmpty(mAccountName)) {
- mAccountNameTextView.setVisibility(View.VISIBLE);
- mAccountNameTextView.setText(
+ mAccountHeaderNameTextView.setVisibility(View.VISIBLE);
+ mAccountHeaderNameTextView.setText(
mContext.getString(R.string.from_account_format, mAccountName));
} else {
// Hide this view so the other text view will be centered vertically
- mAccountNameTextView.setVisibility(View.GONE);
+ mAccountHeaderNameTextView.setVisibility(View.GONE);
}
- mAccountTypeTextView.setText(mContext.getString(R.string.account_type_format,
+ mAccountHeaderTypeTextView.setText(mContext.getString(R.string.account_type_format,
accountType));
}
- mAccountTypeTextView.setTextColor(mContext.getResources().getColor(
- R.color.secondary_text_color));
+ updateAccountHeaderContentDescription();
// TODO: Expose data set in the UI somehow?
- mAccountIcon.setImageDrawable(type.getDisplayIcon(mContext));
-
mRawContactId = state.getRawContactId();
ValuesDelta primary;
@@ -181,23 +164,16 @@
mContext.getString(R.string.missing_name));
if (type.getEditContactActivityClassName() != null) {
- mAccountContainer.setBackgroundDrawable(null);
- mAccountContainer.setEnabled(false);
mEditExternallyButton.setVisibility(View.VISIBLE);
} else {
- mAccountContainer.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- Toast.makeText(mContext, mContext.getString(R.string.contact_read_only),
- Toast.LENGTH_SHORT).show();
- }
- });
mEditExternallyButton.setVisibility(View.GONE);
}
final Resources res = mContext.getResources();
// Phones
- ArrayList<ValuesDelta> phones = state.getMimeEntries(Phone.CONTENT_ITEM_TYPE);
+ final ArrayList<ValuesDelta> phones = state.getMimeEntries(Phone.CONTENT_ITEM_TYPE);
+ final Drawable phoneDrawable = getResources().getDrawable(R.drawable.ic_phone_24dp);
+ final String phoneContentDescription = res.getString(R.string.header_phone_entry);
if (phones != null) {
boolean isFirstPhoneBound = true;
for (ValuesDelta phone : phones) {
@@ -213,14 +189,16 @@
phoneType = Phone.getTypeLabel(
res, phone.getPhoneType(), phone.getPhoneLabel());
}
- bindData(mContext.getText(R.string.phoneLabelsGroup), formattedNumber,
- phoneType, isFirstPhoneBound, true);
+ bindData(phoneDrawable, phoneContentDescription, formattedNumber, phoneType,
+ isFirstPhoneBound, true);
isFirstPhoneBound = false;
}
}
// Emails
- ArrayList<ValuesDelta> emails = state.getMimeEntries(Email.CONTENT_ITEM_TYPE);
+ final ArrayList<ValuesDelta> emails = state.getMimeEntries(Email.CONTENT_ITEM_TYPE);
+ final Drawable emailDrawable = getResources().getDrawable(R.drawable.ic_email_24dp);
+ final String emailContentDescription = res.getString(R.string.header_email_entry);
if (emails != null) {
boolean isFirstEmailBound = true;
for (ValuesDelta email : emails) {
@@ -233,7 +211,7 @@
emailType = Email.getTypeLabel(
res, email.getEmailType(), email.getEmailLabel());
}
- bindData(mContext.getText(R.string.emailLabelsGroup), emailAddress, emailType,
+ bindData(emailDrawable, emailContentDescription, emailAddress, emailType,
isFirstEmailBound);
isFirstEmailBound = false;
}
@@ -247,23 +225,22 @@
}
}
- private void bindData(CharSequence titleText, CharSequence data, CharSequence type,
- boolean isFirstEntry) {
- bindData(titleText, data, type, isFirstEntry, false);
+ private void bindData(Drawable icon, String iconContentDescription, CharSequence data,
+ CharSequence type, boolean isFirstEntry) {
+ bindData(icon, iconContentDescription, data, type, isFirstEntry, false);
}
- private void bindData(CharSequence titleText, CharSequence data, CharSequence type,
- boolean isFirstEntry, boolean forceLTR) {
+ private void bindData(Drawable icon, String iconContentDescription, CharSequence data,
+ CharSequence type, boolean isFirstEntry, boolean forceLTR) {
final View field = mInflater.inflate(R.layout.item_read_only_field, mGeneral, false);
- final View divider = field.findViewById(R.id.divider);
if (isFirstEntry) {
- final TextView titleView = (TextView) field.findViewById(R.id.kind_title);
- titleView.setText(titleText);
- divider.setVisibility(View.GONE);
+ final ImageView imageView = (ImageView) field.findViewById(R.id.kind_icon);
+ imageView.setImageDrawable(icon);
+ imageView.setContentDescription(iconContentDescription);
} else {
- View titleContainer = field.findViewById(R.id.kind_title_layout);
- titleContainer.setVisibility(View.GONE);
- divider.setVisibility(View.VISIBLE);
+ final ImageView imageView = (ImageView) field.findViewById(R.id.kind_icon);
+ imageView.setVisibility(View.INVISIBLE);
+ imageView.setContentDescription(null);
}
final TextView dataView = (TextView) field.findViewById(R.id.data);
dataView.setText(data);
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 3408435..b24f7f1 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -73,6 +73,7 @@
} else {
mChanged = false;
}
+ updateEmptiness();
}
@Override
@@ -274,4 +275,12 @@
return 0;
}
}
+
+ /** {@inheritDoc} */
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+ // Remove padding below this view.
+ setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0);
+ }
}
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index e658f53..bb5210a 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -26,7 +26,7 @@
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.util.Log;
-import android.view.Gravity;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
@@ -58,9 +58,9 @@
private boolean mHideOptional = true;
private boolean mHasShortAndLongForms;
private int mMinFieldHeight;
- private int mEditTextTopPadding;
- private int mEditTextBottomPadding;
private int mPreviousViewHeight;
+ private int mHintTextColor;
+ private int mHintTextColorUnfocused;
public TextFieldsEditorView(Context context) {
super(context);
@@ -84,38 +84,38 @@
mMinFieldHeight = mContext.getResources().getDimensionPixelSize(
R.dimen.editor_min_line_item_height);
- mEditTextBottomPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.editor_text_field_bottom_padding);
- mEditTextTopPadding = mContext.getResources().getDimensionPixelSize(
- R.dimen.editor_text_field_top_padding);
mFields = (ViewGroup) findViewById(R.id.editors);
+ mHintTextColor = getResources().getColor(R.color.secondary_text_color);
+ mHintTextColorUnfocused = getResources().getColor(R.color.editor_disabled_text_color);
mExpansionView = (ImageView) findViewById(R.id.expansion_view);
mExpansionViewContainer = findViewById(R.id.expansion_view_container);
- mExpansionViewContainer.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- mPreviousViewHeight = mFields.getHeight();
+ if (mExpansionViewContainer != null) {
+ mExpansionViewContainer.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mPreviousViewHeight = mFields.getHeight();
- // Save focus
- final View focusedChild = getFocusedChild();
- final int focusedViewId = focusedChild == null ? -1 : focusedChild.getId();
+ // Save focus
+ final View focusedChild = getFocusedChild();
+ final int focusedViewId = focusedChild == null ? -1 : focusedChild.getId();
- // Reconfigure GUI
- mHideOptional = !mHideOptional;
- onOptionalFieldVisibilityChange();
- rebuildValues();
+ // Reconfigure GUI
+ mHideOptional = !mHideOptional;
+ onOptionalFieldVisibilityChange();
+ rebuildValues();
- // Restore focus
- View newFocusView = findViewById(focusedViewId);
- if (newFocusView == null || newFocusView.getVisibility() == GONE) {
- // find first visible child
- newFocusView = TextFieldsEditorView.this;
+ // Restore focus
+ View newFocusView = findViewById(focusedViewId);
+ if (newFocusView == null || newFocusView.getVisibility() == GONE) {
+ // find first visible child
+ newFocusView = TextFieldsEditorView.this;
+ }
+ newFocusView.requestFocus();
+
+ EditorAnimator.getInstance().slideAndFadeIn(mFields, mPreviousViewHeight);
}
- newFocusView.requestFocus();
-
- EditorAnimator.getInstance().slideAndFadeIn(mFields, mPreviousViewHeight);
- }
- });
+ });
+ }
}
@Override
@@ -143,7 +143,39 @@
mFieldEditTexts[index].setEnabled(!isReadOnly() && enabled);
}
}
- mExpansionView.setEnabled(!isReadOnly() && enabled);
+ if (mExpansionView != null) {
+ mExpansionView.setEnabled(!isReadOnly() && enabled);
+ }
+ }
+
+ private OnFocusChangeListener mTextFocusChangeListener = new OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ // Check whether this field contains focus by calling findFocus() instead of
+ // hasFocus(). The hasFocus() value is not necessarily up to date.
+ setHintColorDark(TextFieldsEditorView.this.findFocus() != null);
+ if (getEditorListener() != null) {
+ getEditorListener().onRequest(EditorListener.EDITOR_FOCUS_CHANGED);
+ }
+ // Rebuild the label spinner using the new colors.
+ rebuildLabel();
+ }
+ };
+
+ /**
+ * Set the hint color. If {@param isHintDark} is TRUE, then the hint color is set to a
+ * a darker color.
+ */
+ public void setHintColorDark(boolean isHintDark) {
+ if (mFieldEditTexts != null) {
+ for (EditText text : mFieldEditTexts) {
+ if (isHintDark) {
+ text.setHintTextColor(mHintTextColor);
+ } else {
+ text.setHintTextColor(mHintTextColorUnfocused);
+ }
+ }
+ }
}
/**
@@ -203,18 +235,9 @@
final EditText fieldView = new EditText(mContext);
fieldView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT));
- // Set either a minimum line requirement or a minimum height (because {@link TextView}
- // only takes one or the other at a single time).
- if (field.minLines != 0) {
- fieldView.setMinLines(field.minLines);
- } else {
- fieldView.setMinHeight(mMinFieldHeight);
- }
- fieldView.setTextAppearance(getContext(), android.R.style.TextAppearance_Medium);
- fieldView.setPadding(fieldView.getPaddingLeft(), mEditTextTopPadding,
- fieldView.getPaddingRight(), mEditTextBottomPadding);
- fieldView.setHintTextColor(R.color.secondary_text_color);
- fieldView.setGravity(Gravity.TOP);
+ fieldView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getResources().getDimension(R.dimen.editor_form_text_size));
+ fieldView.setHintTextColor(mHintTextColorUnfocused);
mFieldEditTexts[index] = fieldView;
fieldView.setId(vig.getId(state, kind, entry, index));
if (field.titleRes > 0) {
@@ -227,6 +250,16 @@
fieldView.setTextDirection(View.TEXT_DIRECTION_LTR);
}
+ // Set either a minimum line requirement or a minimum height (because {@link TextView}
+ // only takes one or the other at a single time).
+ if (field.minLines > 1) {
+ fieldView.setMinLines(field.minLines);
+ } else {
+ // This needs to be called after setInputType. Otherwise, calling setInputType
+ // will unset this value.
+ fieldView.setMinHeight(mMinFieldHeight);
+ }
+
// Show the "next" button in IME to navigate between text fields
// TODO: Still need to properly navigate to/from sections without text fields,
// See Bug: 5713510
@@ -258,6 +291,7 @@
});
fieldView.setEnabled(isEnabled() && !readOnly);
+ fieldView.setOnFocusChangeListener(mTextFocusChangeListener);
if (field.shortForm) {
hidePossible = true;
@@ -278,9 +312,12 @@
mFields.addView(fieldView);
}
- // When hiding fields, place expandable
- setupExpansionView(hidePossible, mHideOptional);
- mExpansionView.setEnabled(!readOnly && isEnabled());
+ if (mExpansionView != null) {
+ // When hiding fields, place expandable
+ setupExpansionView(hidePossible, mHideOptional);
+ mExpansionView.setEnabled(!readOnly && isEnabled());
+ }
+ updateEmptiness();
}
@Override
diff --git a/src/com/android/contacts/interactions/CalendarInteraction.java b/src/com/android/contacts/interactions/CalendarInteraction.java
index efd724a..e249e4f 100644
--- a/src/com/android/contacts/interactions/CalendarInteraction.java
+++ b/src/com/android/contacts/interactions/CalendarInteraction.java
@@ -11,6 +11,7 @@
import android.net.Uri;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Events;
+import android.text.Spannable;
import android.text.TextUtils;
import android.text.format.Time;
import android.util.Log;
@@ -278,7 +279,7 @@
}
@Override
- public String getContentDescription(Context context) {
+ public Spannable getContentDescription(Context context) {
// The default TalkBack is good
return null;
}
diff --git a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
index 7d7a8f2..c3927ce 100644
--- a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
@@ -96,13 +96,18 @@
String.valueOf(futureTimeCutoff)};
selectionArgs.addAll(Arrays.asList(timeArguments));
+ // When LAST_SYNCED = 1, the event is not a real event. We should ignore all such events.
+ String IS_NOT_TEMPORARY_COPY_OF_LOCAL_EVENT
+ = CalendarContract.Attendees.LAST_SYNCED + " = 0";
+
String orderBy = CalendarContract.Attendees.DTSTART + (isFuture ? " ASC " : " DESC ");
String selection = caseAndDotInsensitiveEmailComparisonClause(mEmailAddresses.size())
+ " AND " + CalendarContract.Attendees.CALENDAR_ID
+ " IN " + ContactInteractionUtil.questionMarks(calendarIds.size())
+ " AND " + CalendarContract.Attendees.DTSTART + timeOperator + " ? "
+ " AND " + CalendarContract.Attendees.DTSTART + " > ? "
- + " AND " + CalendarContract.Attendees.DTSTART + " < ? ";
+ + " AND " + CalendarContract.Attendees.DTSTART + " < ? "
+ + " AND " + IS_NOT_TEMPORARY_COPY_OF_LOCAL_EVENT;
return getContext().getContentResolver().query(CalendarContract.Attendees.CONTENT_URI,
/* projection = */ null, selection,
diff --git a/src/com/android/contacts/interactions/CallLogInteraction.java b/src/com/android/contacts/interactions/CallLogInteraction.java
index f751ae7..3464c0f 100644
--- a/src/com/android/contacts/interactions/CallLogInteraction.java
+++ b/src/com/android/contacts/interactions/CallLogInteraction.java
@@ -17,6 +17,7 @@
import com.android.contacts.R;
import com.android.contacts.common.util.BitmapUtil;
+import com.android.contacts.common.util.ContactDisplayUtils;
import android.content.ContentValues;
import android.content.Context;
@@ -28,6 +29,7 @@
import android.provider.CallLog.Calls;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.text.BidiFormatter;
+import android.text.Spannable;
import android.text.TextDirectionHeuristics;
/**
@@ -161,8 +163,9 @@
}
public String getNumber() {
- return sBidiFormatter.unicodeWrap(
- mValues.getAsString(Calls.NUMBER), TextDirectionHeuristics.LTR);
+ final String number = mValues.getAsString(Calls.NUMBER);
+ return number == null ? null :
+ sBidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR);
}
public Integer getNumberPresentation() {
@@ -178,11 +181,12 @@
}
@Override
- public String getContentDescription(Context context) {
- String callDetails = getCallTypeString(context) + ". " + getViewFooter(context) + ". " +
- getViewHeader(context) + ". " + getViewFooter(context);
- return context.getResources().getString(R.string.content_description_recent_call,
- callDetails);
+ public Spannable getContentDescription(Context context) {
+ final String phoneNumber = getViewHeader(context);
+ final String contentDescription = context.getResources().getString(
+ R.string.content_description_recent_call,
+ getCallTypeString(context), phoneNumber, getViewFooter(context));
+ return ContactDisplayUtils.getTelephoneTtsSpannable(contentDescription, phoneNumber);
}
private String getCallTypeString(Context context) {
@@ -210,4 +214,4 @@
public int getIconResourceId() {
return CALL_LOG_ICON_RES;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index ed6f2d5..c8e26e9 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -103,6 +103,8 @@
}
private List<ContactInteraction> getCallLogInteractions(String phoneNumber) {
+ // TODO: the phone number added to the ContactInteractions result should retain their
+ // original formatting since TalkBack is not reading the normalized number correctly
final String normalizedNumber = PhoneNumberUtils.normalizeNumber(phoneNumber);
// If the number contains only symbols, we can skip it
if (TextUtils.isEmpty(normalizedNumber)) {
diff --git a/src/com/android/contacts/interactions/ContactInteraction.java b/src/com/android/contacts/interactions/ContactInteraction.java
index 11bbb49..bf00132 100644
--- a/src/com/android/contacts/interactions/ContactInteraction.java
+++ b/src/com/android/contacts/interactions/ContactInteraction.java
@@ -19,6 +19,7 @@
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
+import android.text.Spannable;
/**
* Represents a default interaction between the phone's owner and a contact
@@ -32,7 +33,7 @@
Drawable getIcon(Context context);
Drawable getBodyIcon(Context context);
Drawable getFooterIcon(Context context);
- String getContentDescription(Context context);
+ Spannable getContentDescription(Context context);
/** The resource id for the icon, if available. May be 0 if one is not available. */
int getIconResourceId();
}
diff --git a/src/com/android/contacts/interactions/SmsInteraction.java b/src/com/android/contacts/interactions/SmsInteraction.java
index 8b26023..7d26401 100644
--- a/src/com/android/contacts/interactions/SmsInteraction.java
+++ b/src/com/android/contacts/interactions/SmsInteraction.java
@@ -16,6 +16,7 @@
package com.android.contacts.interactions;
import com.android.contacts.R;
+import com.android.contacts.common.util.ContactDisplayUtils;
import android.content.ContentValues;
import android.content.Context;
@@ -24,6 +25,7 @@
import android.net.Uri;
import android.provider.Telephony.Sms;
import android.text.BidiFormatter;
+import android.text.Spannable;
import android.text.TextDirectionHeuristics;
/**
@@ -92,8 +94,9 @@
}
public String getAddress() {
- return sBidiFormatter.unicodeWrap(
- mValues.getAsString(Sms.ADDRESS), TextDirectionHeuristics.LTR);
+ final String address = mValues.getAsString(Sms.ADDRESS);
+ return address == null ? null :
+ sBidiFormatter.unicodeWrap(address, TextDirectionHeuristics.LTR);
}
public String getBody() {
@@ -158,11 +161,12 @@
}
@Override
- public String getContentDescription(Context context) {
- String messageDetails = getViewHeader(context) + ". " + getViewBody(context) + ". " +
- getViewFooter(context);
- return context.getResources().getString(R.string.content_description_recent_sms,
- messageDetails);
+ public Spannable getContentDescription(Context context) {
+ final String phoneNumber = getViewBody(context);
+ final String contentDescription = context.getResources().getString(
+ R.string.content_description_recent_sms,
+ getViewHeader(context), phoneNumber, getViewFooter(context));
+ return ContactDisplayUtils.getTelephoneTtsSpannable(contentDescription, phoneNumber);
}
@Override
diff --git a/src/com/android/contacts/interactions/SmsInteractionsLoader.java b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
index 8d58712..0cd1e5e 100644
--- a/src/com/android/contacts/interactions/SmsInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
@@ -66,6 +66,8 @@
// Retrieve the thread IDs
List<String> threadIdStrings = new ArrayList<>();
for (String phone : mPhoneNums) {
+ // TODO: the phone numbers added to the ContactInteraction result should retain their
+ // original formatting since TalkBack is not reading the normalized numbers correctly
try {
threadIdStrings.add(String.valueOf(
Telephony.Threads.getOrCreateThreadId(getContext(), phone)));
diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index 855f923..2381ea5 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -126,6 +126,9 @@
Log.e(TAG, "Error: No contact ID or lookup key for contact " + mUri);
return null;
+ } catch (Exception e) {
+ Log.e(TAG, "Error loading the contact: " + mUri, e);
+ return null;
} finally {
if (cursor != null) {
cursor.close();
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index f3788a4..89b02da 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -81,8 +81,11 @@
break;
}
case JoinContactListAdapter.PARTITION_ALL_CONTACTS: {
- Cursor suggestionsCursor = ((JoinContactLoaderResult) data).suggestionCursor;
- onContactListLoaded(suggestionsCursor, data);
+ if (data != null) {
+ final Cursor suggestionsCursor =
+ ((JoinContactLoaderResult) data).suggestionCursor;
+ onContactListLoaded(suggestionsCursor, data);
+ }
break;
}
}
@@ -126,7 +129,9 @@
private void showTargetContactName(String displayName) {
Activity activity = getActivity();
TextView blurbView = (TextView) activity.findViewById(R.id.join_contact_blurb);
- String blurb = activity.getString(R.string.blurbJoinContactDataWith, displayName);
+ final String name = !TextUtils.isEmpty(displayName) ? displayName
+ : activity.getString(R.string.missing_name);
+ String blurb = activity.getString(R.string.blurbJoinContactDataWith, name);
blurbView.setText(blurb);
}
diff --git a/src/com/android/contacts/list/JoinContactLoader.java b/src/com/android/contacts/list/JoinContactLoader.java
index beb5208..075d789 100644
--- a/src/com/android/contacts/list/JoinContactLoader.java
+++ b/src/com/android/contacts/list/JoinContactLoader.java
@@ -52,9 +52,13 @@
@Override
public void close() {
try {
- suggestionCursor.close();
+ if (suggestionCursor != null) {
+ suggestionCursor.close();
+ }
} finally {
- super.close();
+ if (super.getWrappedCursor() != null) {
+ super.close();
+ }
}
}
}
@@ -79,6 +83,23 @@
// to load the entire list
final Cursor suggestionsCursor = getContext().getContentResolver()
.query(mSuggestionUri, mProjection, null, null, null);
- return new JoinContactLoaderResult(super.loadInBackground(), suggestionsCursor);
+ if (suggestionsCursor == null) {
+ return null;
+ }
+ Cursor cursorToClose = suggestionsCursor;
+ try {
+ final Cursor baseCursor = super.loadInBackground();
+ if (baseCursor != null) {
+ final JoinContactLoaderResult result =
+ new JoinContactLoaderResult(baseCursor, suggestionsCursor);
+ cursorToClose = null;
+ return result;
+ }
+ } finally {
+ if (cursorToClose != null) {
+ cursorToClose.close();
+ }
+ }
+ return null;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index f40ebe7..b912a3d 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -23,6 +23,7 @@
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.CardView;
+import android.text.Spannable;
import android.text.TextUtils;
import android.transition.ChangeBounds;
import android.transition.ChangeScroll;
@@ -38,9 +39,7 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
-import android.view.View.OnCreateContextMenuListener;
import android.view.ViewGroup;
-import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@@ -75,7 +74,7 @@
private final Drawable mSubHeaderIcon;
private final String mText;
private final Drawable mTextIcon;
- private final String mPrimaryContentDescription;
+ private Spannable mPrimaryContentDescription;
private final Intent mIntent;
private final Drawable mAlternateIcon;
private final Intent mAlternateIntent;
@@ -88,22 +87,9 @@
private final String mThirdContentDescription;
private final int mIconResourceId;
- public Entry(int id, Drawable icon, String header, String subHeader, String text,
- String primaryContentDescription, Intent intent, Drawable alternateIcon,
- Intent alternateIntent, String alternateContentDescription,
- boolean shouldApplyColor, boolean isEditable,
- EntryContextMenuInfo entryContextMenuInfo, Drawable thirdIcon, Intent thirdIntent,
- String thirdContentDescription, int iconResourceId) {
- this(id, icon, header, subHeader, null, text, null, primaryContentDescription, intent,
- alternateIcon,
- alternateIntent, alternateContentDescription, shouldApplyColor, isEditable,
- entryContextMenuInfo, thirdIcon, thirdIntent, thirdContentDescription,
- iconResourceId);
- }
-
public Entry(int id, Drawable mainIcon, String header, String subHeader,
Drawable subHeaderIcon, String text, Drawable textIcon,
- String primaryContentDescription, Intent intent,
+ Spannable primaryContentDescription, Intent intent,
Drawable alternateIcon, Intent alternateIntent, String alternateContentDescription,
boolean shouldApplyColor, boolean isEditable,
EntryContextMenuInfo entryContextMenuInfo, Drawable thirdIcon, Intent thirdIntent,
@@ -153,7 +139,7 @@
return mTextIcon;
}
- String getPrimaryContentDescription() {
+ Spannable getPrimaryContentDescription() {
return mPrimaryContentDescription;
}
@@ -435,10 +421,10 @@
Resources res = getResources();
separator.setBackgroundColor(res.getColor(
- R.color.expanding_entry_card_item_separator_color));
+ R.color.divider_line_color_light));
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
- res.getDimensionPixelSize(R.dimen.expanding_entry_card_item_separator_height));
+ res.getDimensionPixelSize(R.dimen.divider_line_height));
// The separator is aligned with the text in the entry. This is offset by a default
// margin. If there is an icon present, the icon's width and margin are added
int marginStart = res.getDimensionPixelSize(
@@ -573,15 +559,18 @@
if (entry.shouldApplyColor()) {
Drawable icon = entry.getIcon();
if (icon != null) {
+ icon.mutate();
icon.setColorFilter(mThemeColorFilter);
}
}
Drawable alternateIcon = entry.getAlternateIcon();
if (alternateIcon != null) {
+ alternateIcon.mutate();
alternateIcon.setColorFilter(mThemeColorFilter);
}
Drawable thirdIcon = entry.getThirdIcon();
if (thirdIcon != null) {
+ thirdIcon.mutate();
thirdIcon.setColorFilter(mThemeColorFilter);
}
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index e5574d9..aa10786 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -73,6 +73,7 @@
import android.telecom.PhoneAccount;
import android.telecom.TelecomManager;
import android.text.BidiFormatter;
+import android.text.SpannableString;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import android.util.Log;
@@ -144,9 +145,9 @@
import com.android.contacts.widget.MultiShrinkScroller;
import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListener;
import com.android.contacts.widget.QuickContactImageView;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import java.lang.SecurityException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -156,6 +157,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Mostly translucent {@link Activity} that shows QuickContact dialog. It loads
@@ -177,8 +179,7 @@
private static final int ANIMATION_STATUS_BAR_COLOR_CHANGE_DURATION = 150;
private static final int REQUEST_CODE_CONTACT_EDITOR_ACTIVITY = 1;
- private static final int DEFAULT_SCRIM_ALPHA = 0xC8;
- private static final int SCRIM_COLOR = Color.argb(DEFAULT_SCRIM_ALPHA, 0, 0, 0);
+ private static final int SCRIM_COLOR = Color.argb(0xC8, 0, 0, 0);
private static final int REQUEST_CODE_CONTACT_SELECTION_ACTIVITY = 2;
private static final String MIMETYPE_SMS = "vnd.android-dir/mms-sms";
@@ -191,10 +192,12 @@
private static final String MIMETYPE_GPLUS_PROFILE =
"vnd.android.cursor.item/vnd.googleplus.profile";
- private static final String INTENT_DATA_GPLUS_PROFILE_ADD_TO_CIRCLE = "Add to circle";
+ private static final String GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE = "addtocircle";
+ private static final String GPLUS_PROFILE_DATA_5_VIEW_PROFILE = "view";
private static final String MIMETYPE_HANGOUTS =
"vnd.android.cursor.item/vnd.googleplus.profile.comm";
- private static final String INTENT_DATA_HANGOUTS_VIDEO = "Start video call";
+ private static final String HANGOUTS_DATA_5_VIDEO = "hangout";
+ private static final String HANGOUTS_DATA_5_MESSAGE = "conversation";
private static final String CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY =
"com.android.contacts.quickcontact.QuickContactActivity";
@@ -305,7 +308,13 @@
LOADER_SMS_ID,
LOADER_CALENDAR_ID,
LOADER_CALL_LOG_ID};
- private Map<Integer, List<ContactInteraction>> mRecentLoaderResults = new HashMap<>();
+ /**
+ * ConcurrentHashMap constructor params: 4 is initial table size, 0.9f is
+ * load factor before resizing, 1 means we only expect a single thread to
+ * write to the map so make only a single shard
+ */
+ private Map<Integer, List<ContactInteraction>> mRecentLoaderResults =
+ new ConcurrentHashMap<>(4, 0.9f, 1);
private static final String FRAGMENT_TAG_SELECT_ACCOUNT = "select_account_fragment";
@@ -364,16 +373,18 @@
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- // Force the window dim amount to the scrim value for app transition animations
- // The scrim may be removed before the window transitions to the new activity, which
- // can cause a flicker in the status and navigation bar. Set dim alone does not work
- // well because the request is passed through IPC which makes it slow to animate.
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND,
- WindowManager.LayoutParams.FLAG_DIM_BEHIND);
- getWindow().setDimAmount(mWindowScrim.getAlpha() / DEFAULT_SCRIM_ALPHA);
-
mHasIntentLaunched = true;
- startActivity(intent);
+ try {
+ startActivity(intent);
+ } catch (SecurityException ex) {
+ Toast.makeText(QuickContactActivity.this, R.string.missing_app,
+ Toast.LENGTH_SHORT).show();
+ Log.e(TAG, "QuickContacts does not have permission to launch "
+ + intent);
+ } catch (ActivityNotFoundException ex) {
+ Toast.makeText(QuickContactActivity.this, R.string.missing_app,
+ Toast.LENGTH_SHORT).show();
+ }
}
};
@@ -791,7 +802,11 @@
QuickContact.MODE_LARGE);
final Uri oldLookupUri = mLookupUri;
- mLookupUri = Preconditions.checkNotNull(lookupUri, "missing lookupUri");
+ if (lookupUri == null) {
+ finish();
+ return;
+ }
+ mLookupUri = lookupUri;
mExcludeMimes = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);
if (oldLookupUri == null) {
mContactLoader = (ContactLoader) getLoaderManager().initLoader(
@@ -799,16 +814,21 @@
} else if (oldLookupUri != mLookupUri) {
// After copying a directory contact, the contact URI changes. Therefore,
// we need to restart the loader and reload the new contact.
- for (int interactionLoaderId : mRecentLoaderIds) {
- getLoaderManager().destroyLoader(interactionLoaderId);
- }
+ destroyInteractionLoaders();
mContactLoader = (ContactLoader) getLoaderManager().restartLoader(
LOADER_CONTACT_ID, null, mLoaderContactCallbacks);
+ mCachedCp2DataCardModel = null;
}
NfcHandler.register(this, mLookupUri);
}
+ private void destroyInteractionLoaders() {
+ for (int interactionLoaderId : mRecentLoaderIds) {
+ getLoaderManager().destroyLoader(interactionLoaderId);
+ }
+ }
+
private void runEntranceAnimation() {
if (mHasAlreadyBeenOpened) {
return;
@@ -861,7 +881,6 @@
mPhotoView.setIsBusiness(mContactData.isDisplayNameFromOrganization());
mPhotoSetter.setupContactPhoto(data, mPhotoView);
extractAndApplyTintFromPhotoViewAsynchronously();
- analyzeWhitenessOfPhotoAsynchronously();
setHeaderNameText(ContactDisplayUtils.getDisplayName(this, data).toString());
Trace.endSection();
@@ -985,6 +1004,14 @@
mHasIntentLaunched = false;
populateContactAndAboutCard(mCachedCp2DataCardModel);
}
+
+ // When exiting the activity and resuming, we want to force a full reload of all the
+ // interaction data in case something changed in the background. On screen rotation,
+ // we don't need to do this. And, mCachedCp2DataCardModel will be null, so we won't.
+ if (mCachedCp2DataCardModel != null) {
+ destroyInteractionLoaders();
+ startInteractionLoaders(mCachedCp2DataCardModel);
+ }
}
private void populateContactAndAboutCard(Cp2DataCardModel cp2DataCardModel) {
@@ -1019,7 +1046,9 @@
/* icon = */ null,
getResources().getString(R.string.name_phonetic),
phoneticName,
+ /* subHeaderIcon = */ null,
/* text = */ null,
+ /* textIcon = */ null,
/* primaryContentDescription = */ null,
/* intent = */ null,
/* alternateIcon = */ null,
@@ -1080,7 +1109,8 @@
R.drawable.ic_phone_24dp).mutate();
final Entry phonePromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT,
phoneIcon, getString(R.string.quickcontact_add_phone_number),
- /* subHeader = */ null, /* text = */ null, /* primaryContentDescription = */ null,
+ /* subHeader = */ null, /* subHeaderIcon = */ null, /* text = */ null,
+ /* textIcon = */ null, /* primaryContentDescription = */ null,
getEditContactIntent(),
/* alternateIcon = */ null, /* alternateIntent = */ null,
/* alternateContentDescription = */ null, /* shouldApplyColor = */ true,
@@ -1092,7 +1122,8 @@
R.drawable.ic_email_24dp).mutate();
final Entry emailPromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT,
emailIcon, getString(R.string.quickcontact_add_email), /* subHeader = */ null,
- /* text = */ null, /* primaryContentDescription = */ null,
+ /* subHeaderIcon = */ null,
+ /* text = */ null, /* textIcon = */ null, /* primaryContentDescription = */ null,
getEditContactIntent(), /* alternateIcon = */ null,
/* alternateIntent = */ null, /* alternateContentDescription = */ null,
/* shouldApplyColor = */ true, /* isEditable = */ false,
@@ -1241,9 +1272,11 @@
* additional dependencies on unsafe things (like the Activity).
*
* @param dataItem The {@link DataItem} to convert.
+ * @param secondDataItem A second {@link DataItem} to help build a full entry for some
+ * mimetypes
* @return The {@link ExpandingEntryCardView.Entry}, or null if no visual elements are present.
*/
- private static Entry dataItemToEntry(DataItem dataItem,
+ private static Entry dataItemToEntry(DataItem dataItem, DataItem secondDataItem,
Context context, Contact contactData,
final MutableString aboutCardName) {
Drawable icon = null;
@@ -1452,27 +1485,27 @@
iconResourceId = R.drawable.ic_place_24dp;
}
} else if (dataItem instanceof SipAddressDataItem) {
- if (PhoneCapabilityTester.isSipPhone(context)) {
- final SipAddressDataItem sip = (SipAddressDataItem) dataItem;
- final String address = sip.getSipAddress();
- if (!TextUtils.isEmpty(address)) {
- primaryContentDescription.append(res.getString(R.string.call_other)).append(
- " ");
+ final SipAddressDataItem sip = (SipAddressDataItem) dataItem;
+ final String address = sip.getSipAddress();
+ if (!TextUtils.isEmpty(address)) {
+ primaryContentDescription.append(res.getString(R.string.call_other)).append(
+ " ");
+ if (PhoneCapabilityTester.isSipPhone(context)) {
final Uri callUri = Uri.fromParts(PhoneAccount.SCHEME_SIP, address, null);
intent = CallUtil.getCallIntent(callUri);
- header = address;
- entryContextMenuInfo = new EntryContextMenuInfo(header,
- res.getString(R.string.phoneLabelsGroup), dataItem.getMimeType(),
- dataItem.getId(), dataItem.isSuperPrimary());
- if (sip.hasKindTypeColumn(kind)) {
- text = SipAddress.getTypeLabel(res,
- sip.getKindTypeColumn(kind), sip.getLabel()).toString();
- primaryContentDescription.append(text).append(" ");
- }
- primaryContentDescription.append(header);
- icon = res.getDrawable(R.drawable.ic_dialer_sip_black_24dp);
- iconResourceId = R.drawable.ic_dialer_sip_black_24dp;
}
+ header = address;
+ entryContextMenuInfo = new EntryContextMenuInfo(header,
+ res.getString(R.string.phoneLabelsGroup), dataItem.getMimeType(),
+ dataItem.getId(), dataItem.isSuperPrimary());
+ if (sip.hasKindTypeColumn(kind)) {
+ text = SipAddress.getTypeLabel(res,
+ sip.getKindTypeColumn(kind), sip.getLabel()).toString();
+ primaryContentDescription.append(text).append(" ");
+ }
+ primaryContentDescription.append(header);
+ icon = res.getDrawable(R.drawable.ic_dialer_sip_black_24dp);
+ iconResourceId = R.drawable.ic_dialer_sip_black_24dp;
}
} else if (dataItem instanceof StructuredNameDataItem) {
final String givenName = ((StructuredNameDataItem) dataItem).getGivenName();
@@ -1493,26 +1526,57 @@
if (intent != null) {
final String mimetype = intent.getType();
- // Attempt to use known icons for known 3p types. Otherwise default to ResolveCache
+ // Build advanced entry for known 3p types. Otherwise default to ResolveCache icon.
switch (mimetype) {
case MIMETYPE_GPLUS_PROFILE:
- if (INTENT_DATA_GPLUS_PROFILE_ADD_TO_CIRCLE.equals(
- intent.getDataString())) {
- icon = res.getDrawable(
- R.drawable.ic_add_to_circles_black_24);
- iconResourceId = R.drawable.ic_add_to_circles_black_24;
- } else {
+ // If a secondDataItem is available, use it to build an entry with
+ // alternate actions
+ if (secondDataItem != null) {
icon = res.getDrawable(R.drawable.ic_google_plus_24dp);
- iconResourceId = R.drawable.ic_google_plus_24dp;
+ alternateIcon = res.getDrawable(R.drawable.ic_add_to_circles_black_24);
+ final GPlusOrHangoutsDataItemModel itemModel =
+ new GPlusOrHangoutsDataItemModel(intent, alternateIntent,
+ dataItem, secondDataItem, alternateContentDescription,
+ header, text, context);
+
+ populateGPlusOrHangoutsDataItemModel(itemModel);
+ intent = itemModel.intent;
+ alternateIntent = itemModel.alternateIntent;
+ alternateContentDescription = itemModel.alternateContentDescription;
+ header = itemModel.header;
+ text = itemModel.text;
+ } else {
+ if (GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE.equals(
+ intent.getDataString())) {
+ icon = res.getDrawable(R.drawable.ic_add_to_circles_black_24);
+ } else {
+ icon = res.getDrawable(R.drawable.ic_google_plus_24dp);
+ }
}
break;
case MIMETYPE_HANGOUTS:
- if (INTENT_DATA_HANGOUTS_VIDEO.equals(intent.getDataString())) {
- icon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
- iconResourceId = R.drawable.ic_hangout_video_24dp;
- } else {
+ // If a secondDataItem is available, use it to build an entry with
+ // alternate actions
+ if (secondDataItem != null) {
icon = res.getDrawable(R.drawable.ic_hangout_24dp);
- iconResourceId = R.drawable.ic_hangout_24dp;
+ alternateIcon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
+ final GPlusOrHangoutsDataItemModel itemModel =
+ new GPlusOrHangoutsDataItemModel(intent, alternateIntent,
+ dataItem, secondDataItem, alternateContentDescription,
+ header, text, context);
+
+ populateGPlusOrHangoutsDataItemModel(itemModel);
+ intent = itemModel.intent;
+ alternateIntent = itemModel.alternateIntent;
+ alternateContentDescription = itemModel.alternateContentDescription;
+ header = itemModel.header;
+ text = itemModel.text;
+ } else {
+ if (HANGOUTS_DATA_5_VIDEO.equals(intent.getDataString())) {
+ icon = res.getDrawable(R.drawable.ic_hangout_video_24dp);
+ } else {
+ icon = res.getDrawable(R.drawable.ic_hangout_24dp);
+ }
}
break;
default:
@@ -1558,7 +1622,8 @@
-1 : (int) dataItem.getId();
return new Entry(dataId, icon, header, subHeader, subHeaderIcon, text, textIcon,
- primaryContentDescription.toString(), intent, alternateIcon, alternateIntent,
+ new SpannableString(primaryContentDescription.toString()),
+ intent, alternateIcon, alternateIntent,
alternateContentDescription.toString(), shouldApplyColor, isEditable,
entryContextMenuInfo, thirdIcon, thirdIntent, thirdContentDescription,
iconResourceId);
@@ -1566,16 +1631,124 @@
private List<Entry> dataItemsToEntries(List<DataItem> dataItems,
MutableString aboutCardTitleOut) {
+ // Hangouts and G+ use two data items to create one entry.
+ if (dataItems.get(0).getMimeType().equals(MIMETYPE_GPLUS_PROFILE) ||
+ dataItems.get(0).getMimeType().equals(MIMETYPE_HANGOUTS)) {
+ return gPlusOrHangoutsDataItemsToEntries(dataItems);
+ } else {
+ final List<Entry> entries = new ArrayList<>();
+ for (DataItem dataItem : dataItems) {
+ final Entry entry = dataItemToEntry(dataItem, /* secondDataItem = */ null,
+ this, mContactData, aboutCardTitleOut);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ }
+ return entries;
+ }
+ }
+
+ /**
+ * G+ and Hangout entries are unique in that a single ExpandingEntryCardView.Entry consists
+ * of two data items. This method attempts to build each entry using the two data items if
+ * they are available. If there are more or less than two data items, a fall back is used
+ * and each data item gets its own entry.
+ */
+ private List<Entry> gPlusOrHangoutsDataItemsToEntries(List<DataItem> dataItems) {
final List<Entry> entries = new ArrayList<>();
+ final Map<Long, List<DataItem>> buckets = new HashMap<>();
+ // Put the data items into buckets based on the raw contact id
for (DataItem dataItem : dataItems) {
- final Entry entry = dataItemToEntry(dataItem, this, mContactData, aboutCardTitleOut);
- if (entry != null) {
- entries.add(entry);
+ List<DataItem> bucket = buckets.get(dataItem.getRawContactId());
+ if (bucket == null) {
+ bucket = new ArrayList<>();
+ buckets.put(dataItem.getRawContactId(), bucket);
+ }
+ bucket.add(dataItem);
+ }
+
+ // Use the buckets to build entries. If a bucket contains two data items, build the special
+ // entry, otherwise fall back to the normal entry.
+ for (List<DataItem> bucket : buckets.values()) {
+ if (bucket.size() == 2) {
+ // Use the pair to build an entry
+ final Entry entry = dataItemToEntry(bucket.get(0),
+ /* secondDataItem = */ bucket.get(1), this, mContactData,
+ /* aboutCardName = */ null);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ } else {
+ for (DataItem dataItem : bucket) {
+ final Entry entry = dataItemToEntry(dataItem, /* secondDataItem = */ null,
+ this, mContactData, /* aboutCardName = */ null);
+ if (entry != null) {
+ entries.add(entry);
+ }
+ }
}
}
return entries;
}
+ /**
+ * Used for statically passing around G+ or Hangouts data items and entry fields to
+ * populateGPlusOrHangoutsDataItemModel.
+ */
+ private static final class GPlusOrHangoutsDataItemModel {
+ public Intent intent;
+ public Intent alternateIntent;
+ public DataItem dataItem;
+ public DataItem secondDataItem;
+ public StringBuilder alternateContentDescription;
+ public String header;
+ public String text;
+ public Context context;
+
+ public GPlusOrHangoutsDataItemModel(Intent intent, Intent alternateIntent, DataItem dataItem,
+ DataItem secondDataItem, StringBuilder alternateContentDescription, String header,
+ String text, Context context) {
+ this.intent = intent;
+ this.alternateIntent = alternateIntent;
+ this.dataItem = dataItem;
+ this.secondDataItem = secondDataItem;
+ this.alternateContentDescription = alternateContentDescription;
+ this.header = header;
+ this.text = text;
+ this.context = context;
+ }
+ }
+
+ private static void populateGPlusOrHangoutsDataItemModel(
+ GPlusOrHangoutsDataItemModel dataModel) {
+ final Intent secondIntent = new Intent(Intent.ACTION_VIEW);
+ secondIntent.setDataAndType(ContentUris.withAppendedId(Data.CONTENT_URI,
+ dataModel.secondDataItem.getId()), dataModel.secondDataItem.getMimeType());
+ // There is no guarantee the order the data items come in. Second
+ // data item does not necessarily mean it's the alternate.
+ // Hangouts video and Add to circles should be alternate. Swap if needed
+ if (HANGOUTS_DATA_5_VIDEO.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5)) ||
+ GPLUS_PROFILE_DATA_5_ADD_TO_CIRCLE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5))) {
+ dataModel.alternateIntent = dataModel.intent;
+ dataModel.alternateContentDescription = new StringBuilder(dataModel.header);
+
+ dataModel.intent = secondIntent;
+ dataModel.header = dataModel.secondDataItem.buildDataStringForDisplay(dataModel.context,
+ dataModel.secondDataItem.getDataKind());
+ dataModel.text = dataModel.secondDataItem.getDataKind().typeColumn;
+ } else if (HANGOUTS_DATA_5_MESSAGE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5)) ||
+ GPLUS_PROFILE_DATA_5_VIEW_PROFILE.equals(
+ dataModel.dataItem.getContentValues().getAsString(Data.DATA5))) {
+ dataModel.alternateIntent = secondIntent;
+ dataModel.alternateContentDescription = new StringBuilder(
+ dataModel.secondDataItem.buildDataStringForDisplay(dataModel.context,
+ dataModel.secondDataItem.getDataKind()));
+ }
+ }
+
private static String getIntentResolveLabel(Intent intent, Context context) {
final List<ResolveInfo> matches = context.getPackageManager().queryIntentActivities(intent,
PackageManager.MATCH_DEFAULT_ONLY);
@@ -1610,7 +1783,7 @@
@Override
protected MaterialPalette doInBackground(Void... params) {
- if (imageViewDrawable instanceof BitmapDrawable
+ if (imageViewDrawable instanceof BitmapDrawable && mContactData != null
&& mContactData.getThumbnailPhotoBinaryData() != null
&& mContactData.getThumbnailPhotoBinaryData().length > 0) {
// Perform the color analysis on the thumbnail instead of the full sized
@@ -1657,30 +1830,6 @@
}.execute();
}
- /**
- * Examine how many white pixels are in the bitmap in order to determine whether or not
- * we need gradient overlays on top of the image.
- */
- private void analyzeWhitenessOfPhotoAsynchronously() {
- final Drawable imageViewDrawable = mPhotoView.getDrawable();
- new AsyncTask<Void, Void, Boolean>() {
- @Override
- protected Boolean doInBackground(Void... params) {
- if (imageViewDrawable instanceof BitmapDrawable) {
- final Bitmap bitmap = ((BitmapDrawable) imageViewDrawable).getBitmap();
- return WhitenessUtils.isBitmapWhiteAtTopOrBottom(bitmap);
- }
- return !(imageViewDrawable instanceof LetterTileDrawable);
- }
-
- @Override
- protected void onPostExecute(Boolean isWhite) {
- super.onPostExecute(isWhite);
- mScroller.setUseGradient(isWhite);
- }
- }.execute();
- }
-
private void setThemeColor(MaterialPalette palette) {
// If the color is invalid, use the predefined default
final int primaryColor = palette.mPrimaryColor;
@@ -1760,29 +1909,33 @@
@Override
public void onLoadFinished(Loader<Contact> loader, Contact data) {
Trace.beginSection("onLoadFinished()");
+ try {
- if (isFinishing()) {
- return;
- }
- if (data.isError()) {
- // This shouldn't ever happen, so throw an exception. The {@link ContactLoader}
- // should log the actual exception.
- throw new IllegalStateException("Failed to load contact", data.getException());
- }
- if (data.isNotFound()) {
- if (mHasAlreadyBeenOpened) {
+ if (isFinishing()) {
+ return;
+ }
+ if (data.isError()) {
+ // This means either the contact is invalid or we had an
+ // internal error such as an acore crash.
+ Log.i(TAG, "Failed to load contact: " + ((ContactLoader)loader).getLookupUri());
+ Toast.makeText(QuickContactActivity.this, R.string.invalidContactMessage,
+ Toast.LENGTH_LONG).show();
finish();
- } else {
+ return;
+ }
+ if (data.isNotFound()) {
Log.i(TAG, "No contact found: " + ((ContactLoader)loader).getLookupUri());
Toast.makeText(QuickContactActivity.this, R.string.invalidContactMessage,
Toast.LENGTH_LONG).show();
+ finish();
+ return;
}
- return;
+
+ bindContactData(data);
+
+ } finally {
+ Trace.endSection();
}
-
- bindContactData(data);
-
- Trace.endSection();
}
@Override
@@ -1822,18 +1975,15 @@
@Override
public Loader<List<ContactInteraction>> onCreateLoader(int id, Bundle args) {
- Log.v(TAG, "onCreateLoader");
Loader<List<ContactInteraction>> loader = null;
switch (id) {
case LOADER_SMS_ID:
- Log.v(TAG, "LOADER_SMS_ID");
loader = new SmsInteractionsLoader(
QuickContactActivity.this,
args.getStringArray(KEY_LOADER_EXTRA_PHONES),
MAX_SMS_RETRIEVE);
break;
case LOADER_CALENDAR_ID:
- Log.v(TAG, "LOADER_CALENDAR_ID");
final String[] emailsArray = args.getStringArray(KEY_LOADER_EXTRA_EMAILS);
List<String> emailsList = null;
if (emailsArray != null) {
@@ -1848,7 +1998,6 @@
PAST_MILLISECOND_TO_SEARCH_LOCAL_CALENDAR);
break;
case LOADER_CALL_LOG_ID:
- Log.v(TAG, "LOADER_CALL_LOG_ID");
loader = new CallLogInteractionsLoader(
QuickContactActivity.this,
args.getStringArray(KEY_LOADER_EXTRA_PHONES),
@@ -1983,6 +2132,11 @@
startActivityForResult(getEditContactIntent(), REQUEST_CODE_CONTACT_EDITOR_ACTIVITY);
}
+ private void deleteContact() {
+ final Uri contactUri = mContactData.getLookupUri();
+ ContactDeletionInteraction.start(this, contactUri, /* finishActivityWhenDone =*/ true);
+ }
+
private void toggleStar(MenuItem starredMenuItem) {
// Make sure there is a contact
if (mContactData != null) {
@@ -2081,6 +2235,9 @@
}
private boolean isShortcutCreatable() {
+ if (mContactData == null || mContactData.isUserProfile()) {
+ return false;
+ }
final Intent createShortcutIntent = new Intent();
createShortcutIntent.setAction(ACTION_INSTALL_SHORTCUT);
final List<ResolveInfo> receivers = getPackageManager()
@@ -2117,6 +2274,9 @@
editMenuItem.setVisible(false);
}
+ final MenuItem deleteMenuItem = menu.findItem(R.id.menu_delete);
+ deleteMenuItem.setVisible(isContactEditable());
+
final MenuItem shareMenuItem = menu.findItem(R.id.menu_share);
shareMenuItem.setVisible(isContactShareable());
@@ -2144,12 +2304,23 @@
final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
intent.setType(Contacts.CONTENT_ITEM_TYPE);
- // Only pre-fill the name field if the provided display name is an organization
- // name or better (e.g. structured name, nickname)
- if (mContactData.getDisplayNameSource() >= DisplayNameSources.ORGANIZATION) {
- intent.putExtra(Intents.Insert.NAME, mContactData.getDisplayName());
- }
ArrayList<ContentValues> values = mContactData.getContentValues();
+
+ // Only pre-fill the name field if the provided display name is an nickname
+ // or better (e.g. structured name, nickname)
+ if (mContactData.getDisplayNameSource() >= DisplayNameSources.NICKNAME) {
+ intent.putExtra(Intents.Insert.NAME, mContactData.getDisplayName());
+ } else if (mContactData.getDisplayNameSource()
+ == DisplayNameSources.ORGANIZATION) {
+ // This is probably an organization. Instead of copying the organization
+ // name into a name entry, copy it into the organization entry. This
+ // way we will still consider the contact an organization.
+ final ContentValues organization = new ContentValues();
+ organization.put(Organization.COMPANY, mContactData.getDisplayName());
+ organization.put(Data.MIMETYPE, Organization.CONTENT_ITEM_TYPE);
+ values.add(organization);
+ }
+
// Last time used and times used are aggregated values from the usage stat
// table. They need to be removed from data values so the SQL table can insert
// properly
@@ -2183,8 +2354,13 @@
editContact();
}
return true;
+ case R.id.menu_delete:
+ deleteContact();
+ return true;
case R.id.menu_share:
- shareContact();
+ if (isContactShareable()) {
+ shareContact();
+ }
return true;
case R.id.menu_create_contact_shortcut:
createLauncherShortcutWithContact();
diff --git a/src/com/android/contacts/quickcontact/WhitenessUtils.java b/src/com/android/contacts/quickcontact/WhitenessUtils.java
deleted file mode 100644
index 0d2f2e2..0000000
--- a/src/com/android/contacts/quickcontact/WhitenessUtils.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-
-package com.android.contacts.quickcontact;
-
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.Trace;
-
-/**
- * Utility class for determining whether Bitmaps contain a lot of white pixels in locations
- * where QuickContactActivity will want to place white text or buttons.
- *
- * This class liberally considers bitmaps white. All constants are chosen with a small amount of
- * experimentation. Despite a lack of rigour, this class successfully allows QuickContactsActivity
- * to detect when Bitmap are obviously *not* white. Therefore, it is better than nothing.
- */
-public class WhitenessUtils {
-
- /**
- * Analyze this amount of the top and bottom of the bitmap.
- */
- private static final float HEIGHT_PERCENT_ANALYZED = 0.2f;
-
- /**
- * An image with more than this amount white, is considered to be a whitish image.
- */
- private static final float PROPORTION_WHITE_CUTOFF = 0.1f;
-
- private static final float THIRD = 0.33f;
-
- /**
- * Colors with luma greater than this are considered close to white. This value is lower than
- * the value used in Palette's ColorUtils, since we want to liberally declare images white.
- */
- private static final float LUMINANCE_OF_WHITE = 0.90f;
-
- /**
- * Returns true if 20% of the image's top right corner is white, or 20% of the bottom
- * of the image is white.
- */
- public static boolean isBitmapWhiteAtTopOrBottom(Bitmap largeBitmap) {
- Trace.beginSection("isBitmapWhiteAtTopOrBottom");
- try {
- final Bitmap smallBitmap = scaleBitmapDown(largeBitmap);
-
- final int[] rgbPixels = new int[smallBitmap.getWidth() * smallBitmap.getHeight()];
- smallBitmap.getPixels(rgbPixels, 0, smallBitmap.getWidth(), 0, 0,
- smallBitmap.getWidth(), smallBitmap.getHeight());
-
- // look at top right corner of the bitmap
- int whiteCount = 0;
- for (int y = 0; y < smallBitmap.getHeight() * HEIGHT_PERCENT_ANALYZED; y++) {
- for (int x = (int) (smallBitmap.getWidth() * (1 - THIRD));
- x < smallBitmap.getWidth(); x++) {
- final int rgb = rgbPixels[y * smallBitmap.getWidth() + x];
- if (isWhite(rgb)) {
- whiteCount ++;
- }
- }
- }
- int totalPixels = (int) (smallBitmap.getHeight() * smallBitmap.getWidth()
- * THIRD * HEIGHT_PERCENT_ANALYZED);
- if (whiteCount / (float) totalPixels > PROPORTION_WHITE_CUTOFF) {
- return true;
- }
-
- // look at bottom portion of bitmap
- whiteCount = 0;
- for (int y = (int) (smallBitmap.getHeight() * (1 - HEIGHT_PERCENT_ANALYZED));
- y < smallBitmap.getHeight(); y++) {
- for (int x = 0; x < smallBitmap.getWidth(); x++) {
- final int rgb = rgbPixels[y * smallBitmap.getWidth() + x];
- if (isWhite(rgb)) {
- whiteCount ++;
- }
- }
- }
-
- totalPixels = (int) (smallBitmap.getHeight()
- * smallBitmap.getWidth() * HEIGHT_PERCENT_ANALYZED);
-
- return whiteCount / (float) totalPixels > PROPORTION_WHITE_CUTOFF;
- } finally {
- Trace.endSection();
- }
- }
-
- private static boolean isWhite(int rgb) {
- return calculateXyzLuma(rgb) > LUMINANCE_OF_WHITE;
- }
-
- private static float calculateXyzLuma(int rgb) {
- return (0.2126f * Color.red(rgb) +
- 0.7152f * Color.green(rgb) +
- 0.0722f * Color.blue(rgb)) / 255f;
- }
-
- /**
- * Scale down the bitmap in order to make color analysis faster. Taken from Palette.
- */
- private static Bitmap scaleBitmapDown(Bitmap bitmap) {
- final int CALCULATE_BITMAP_MIN_DIMENSION = 100;
- final int minDimension = Math.min(bitmap.getWidth(), bitmap.getHeight());
-
- if (minDimension <= CALCULATE_BITMAP_MIN_DIMENSION) {
- // If the bitmap is small enough already, just return it
- return bitmap;
- }
-
- final float scaleRatio = CALCULATE_BITMAP_MIN_DIMENSION / (float) minDimension;
- return Bitmap.createScaledBitmap(bitmap,
- Math.round(bitmap.getWidth() * scaleRatio),
- Math.round(bitmap.getHeight() * scaleRatio),
- false);
- }
-}
diff --git a/src/com/android/contacts/util/ImageViewDrawableSetter.java b/src/com/android/contacts/util/ImageViewDrawableSetter.java
index e926e54..6147c39 100644
--- a/src/com/android/contacts/util/ImageViewDrawableSetter.java
+++ b/src/com/android/contacts/util/ImageViewDrawableSetter.java
@@ -97,9 +97,10 @@
return previousBitmap();
}
- final Drawable newDrawable = (compressed == null)
- ? defaultDrawable()
- : decodedBitmapDrawable(compressed);
+ Drawable newDrawable = decodedBitmapDrawable(compressed);
+ if (newDrawable == null) {
+ newDrawable = defaultDrawable();
+ }
// Remember this for next time, so that we can check if it changed.
mCompressed = compressed;
@@ -159,8 +160,14 @@
}
private BitmapDrawable decodedBitmapDrawable(byte[] compressed) {
+ if (compressed == null) {
+ return null;
+ }
final Resources rsrc = mTarget.getResources();
Bitmap bitmap = BitmapFactory.decodeByteArray(compressed, 0, compressed.length);
+ if (bitmap == null) {
+ return null;
+ }
if (bitmap.getHeight() != bitmap.getWidth()) {
// Crop the bitmap into a square.
final int size = Math.min(bitmap.getWidth(), bitmap.getHeight());
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index dfec204..095198a 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -12,7 +12,6 @@
import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.content.Context;
-import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -41,6 +40,7 @@
import android.widget.Scroller;
import android.widget.ScrollView;
import android.widget.TextView;
+import android.widget.Toolbar;
/**
* A custom {@link ViewGroup} that operates similarly to a {@link ScrollView}, except with multiple
@@ -59,8 +59,8 @@
* customized will work for you. For example, see the re-usable StickyHeaderListView used by
* WifiSetupActivity (very nice). Alternatively, check out Google+'s cover photo scrolling or
* Android L's built in nested scrolling support. I thought I needed a more custom ViewGroup in
- * order to track velocity, modify EdgeEffect color & perform specific animations such as the ones
- * inside snapToBottom(). As a result this ViewGroup has non-standard talkback and keyboard support.
+ * order to track velocity, modify EdgeEffect color & perform the originally specified animations.
+ * As a result this ViewGroup has non-standard talkback and keyboard support.
*/
public class MultiShrinkScroller extends FrameLayout {
@@ -72,27 +72,35 @@
/**
* Length of the acceleration animations. This value was taken from ValueAnimator.java.
*/
- private static final int EXIT_FLING_ANIMATION_DURATION_MS = 300;
-
- /**
- * Length of the entrance animation.
- */
- private static final int ENTRANCE_ANIMATION_SLIDE_OPEN_DURATION_MS = 250;
+ private static final int EXIT_FLING_ANIMATION_DURATION_MS = 250;
/**
* In portrait mode, the height:width ratio of the photo's starting height.
*/
- private static final float INTERMEDIATE_HEADER_HEIGHT_RATIO = 0.5f;
+ private static final float INTERMEDIATE_HEADER_HEIGHT_RATIO = 0.6f;
/**
- * Maximum velocity for flings in dips per second. Picked via non-rigorous experimentation.
+ * Color blending will only be performed on the contact photo once the toolbar is compressed
+ * to this ratio of its full height.
*/
- private static final float MAXIMUM_FLING_VELOCITY = 2000;
+ private static final float COLOR_BLENDING_START_RATIO = 0.5f;
+
+ private static final float SPRING_DAMPENING_FACTOR = 0.01f;
+
+ /**
+ * When displaying a letter tile drawable, this alpha value should be used at the intermediate
+ * toolbar height.
+ */
+ private static final float DESIRED_INTERMEDIATE_LETTER_TILE_ALPHA = 0.8f;
private float[] mLastEventPosition = { 0, 0 };
private VelocityTracker mVelocityTracker;
private boolean mIsBeingDragged = false;
private boolean mReceivedDown = false;
+ /**
+ * Did the current downwards fling/scroll-animation start while we were fullscreen?
+ */
+ private boolean mIsFullscreenDownwardsFling = false;
private ScrollView mScrollView;
private View mScrollViewChild;
@@ -103,7 +111,7 @@
private MultiShrinkScrollerListener mListener;
private TextView mLargeTextView;
private View mPhotoTouchInterceptOverlay;
- /** Contains desired location/size of the title, once the header is fully compressed */
+ /** Contains desired size & vertical offset of the title, once the header is fully compressed */
private TextView mInvisiblePlaceholderTextView;
private View mTitleGradientView;
private View mActionBarGradientView;
@@ -132,16 +140,22 @@
* True once the header has touched the top of the screen at least once.
*/
private boolean mHasEverTouchedTheTop;
+ private boolean mIsTouchDisabledForDismissAnimation;
private final Scroller mScroller;
private final EdgeEffect mEdgeGlowBottom;
+ private final EdgeEffect mEdgeGlowTop;
private final int mTouchSlop;
private final int mMaximumVelocity;
private final int mMinimumVelocity;
+ private final int mDismissDistanceOnScroll;
+ private final int mDismissDistanceOnRelease;
+ private final int mSnapToTopSlopHeight;
private final int mTransparentStartHeight;
private final int mMaximumTitleMargin;
private final float mToolbarElevation;
private final boolean mIsTwoPanel;
+ private final float mLandscapePhotoRatio;
private final int mActionBarSize;
// Objects used to perform color filtering on the header. These are stored as fields for
@@ -164,14 +178,8 @@
private final PathInterpolator mTextSizePathInterpolator
= new PathInterpolator(0.16f, 0.4f, 0.2f, 1);
- /**
- * Interpolator that starts and ends with nearly straight segments. At x=0 it has a y of
- * approximately 0.25. We only want the contact photo 25% faded when half collapsed.
- */
- private final PathInterpolator mWhiteBlendingPathInterpolator
- = new PathInterpolator(1.0f, 0.4f, 0.9f, 0.8f);
- private final int[] mGradientColors = new int[] {0,0xAA000000};
+ private final int[] mGradientColors = new int[] {0,0x88000000};
private GradientDrawable mTitleGradientDrawable = new GradientDrawable(
GradientDrawable.Orientation.TOP_BOTTOM, mGradientColors);
private GradientDrawable mActionBarGradientDrawable = new GradientDrawable(
@@ -237,12 +245,11 @@
setWillNotDraw(/* willNotDraw = */ false);
mEdgeGlowBottom = new EdgeEffect(context);
+ mEdgeGlowTop = new EdgeEffect(context);
mScroller = new Scroller(context, sInterpolator);
mTouchSlop = configuration.getScaledTouchSlop();
mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
- mMaximumVelocity = (int)TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_DIP, MAXIMUM_FLING_VELOCITY,
- getResources().getDisplayMetrics());
+ mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
mTransparentStartHeight = (int) getResources().getDimension(
R.dimen.quickcontact_starting_empty_height);
mToolbarElevation = getResources().getDimension(
@@ -251,6 +258,18 @@
mMaximumTitleMargin = (int) getResources().getDimension(
R.dimen.quickcontact_title_initial_margin);
+ mDismissDistanceOnScroll = (int) getResources().getDimension(
+ R.dimen.quickcontact_dismiss_distance_on_scroll);
+ mDismissDistanceOnRelease = (int) getResources().getDimension(
+ R.dimen.quickcontact_dismiss_distance_on_release);
+ mSnapToTopSlopHeight = (int) getResources().getDimension(
+ R.dimen.quickcontact_snap_to_top_slop_height);
+
+ final TypedValue photoRatio = new TypedValue();
+ getResources().getValue(R.dimen.quickcontact_landscape_photo_ratio, photoRatio,
+ /* resolveRefs = */ true);
+ mLandscapePhotoRatio = photoRatio.getFloat();
+
final TypedArray attributeArray = context.obtainStyledAttributes(
new int[]{android.R.attr.actionBarSize});
mActionBarSize = attributeArray.getDimensionPixelSize(0, 0);
@@ -297,6 +316,7 @@
mTitleGradientView.setBackground(mTitleGradientDrawable);
mActionBarGradientView = findViewById(R.id.action_bar_gradient);
mActionBarGradientView.setBackground(mActionBarGradientDrawable);
+ mCollapsedTitleStartMargin = ((Toolbar) findViewById(R.id.toolbar)).getContentInsetStart();
mPhotoTouchInterceptOverlay = findViewById(R.id.photo_touch_intercept_overlay);
if (!mIsTwoPanel) {
@@ -317,9 +337,7 @@
mIntermediateHeaderHeight = (int) (mMaximumHeaderHeight
* INTERMEDIATE_HEADER_HEIGHT_RATIO);
}
- final boolean isLandscape = getResources().getConfiguration().orientation
- == Configuration.ORIENTATION_LANDSCAPE;
- mMaximumPortraitHeaderHeight = isLandscape ? getHeight()
+ mMaximumPortraitHeaderHeight = mIsTwoPanel ? getHeight()
: mPhotoViewContainer.getWidth();
setHeaderHeight(getMaximumScrollableHeaderHeight());
mMaximumHeaderTextSize = mLargeTextView.getHeight();
@@ -329,13 +347,10 @@
mIntermediateHeaderHeight = mMaximumHeaderHeight;
// Permanently set photo width and height.
- final TypedValue photoRatio = new TypedValue();
- getResources().getValue(R.vals.quickcontact_photo_ratio, photoRatio,
- /* resolveRefs = */ true);
final ViewGroup.LayoutParams photoLayoutParams
= mPhotoViewContainer.getLayoutParams();
photoLayoutParams.height = mMaximumHeaderHeight;
- photoLayoutParams.width = (int) (mMaximumHeaderHeight * photoRatio.getFloat());
+ photoLayoutParams.width = (int) (mMaximumHeaderHeight * mLandscapePhotoRatio);
mPhotoViewContainer.setLayoutParams(photoLayoutParams);
// Permanently set title width and margin.
@@ -360,18 +375,17 @@
}
private void configureGradientViewHeights() {
- final float GRADIENT_SIZE_COEFFICIENT = 1.25f;
final FrameLayout.LayoutParams actionBarGradientLayoutParams
= (FrameLayout.LayoutParams) mActionBarGradientView.getLayoutParams();
- actionBarGradientLayoutParams.height
- = (int) (mActionBarSize * GRADIENT_SIZE_COEFFICIENT);
+ actionBarGradientLayoutParams.height = mActionBarSize;
mActionBarGradientView.setLayoutParams(actionBarGradientLayoutParams);
final FrameLayout.LayoutParams titleGradientLayoutParams
= (FrameLayout.LayoutParams) mTitleGradientView.getLayoutParams();
+ final float TITLE_GRADIENT_SIZE_COEFFICIENT = 1.25f;
final FrameLayout.LayoutParams largeTextLayoutParms
= (FrameLayout.LayoutParams) mLargeTextView.getLayoutParams();
titleGradientLayoutParams.height = (int) ((mLargeTextView.getHeight()
- + largeTextLayoutParms.bottomMargin) * GRADIENT_SIZE_COEFFICIENT);
+ + largeTextLayoutParms.bottomMargin) * TITLE_GRADIENT_SIZE_COEFFICIENT);
mTitleGradientView.setLayoutParams(titleGradientLayoutParams);
}
@@ -380,20 +394,20 @@
mPhotoTouchInterceptOverlay.setContentDescription(title);
}
- public void setUseGradient(boolean useGradient) {
- if (mTitleGradientView != null) {
- mTitleGradientView.setVisibility(useGradient ? View.VISIBLE : View.GONE);
- mActionBarGradientView.setVisibility(useGradient ? View.VISIBLE : View.GONE);
- }
- }
-
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
+ if (mVelocityTracker == null) {
+ mVelocityTracker = VelocityTracker.obtain();
+ }
+ mVelocityTracker.addMovement(event);
+
// The only time we want to intercept touch events is when we are being dragged.
return shouldStartDrag(event);
}
private boolean shouldStartDrag(MotionEvent event) {
+ if (mIsTouchDisabledForDismissAnimation) return false;
+
if (mIsBeingDragged) {
mIsBeingDragged = false;
return false;
@@ -428,6 +442,8 @@
@Override
public boolean onTouchEvent(MotionEvent event) {
+ if (mIsTouchDisabledForDismissAnimation) return true;
+
final int action = event.getAction();
if (mVelocityTracker == null) {
@@ -465,6 +481,10 @@
postInvalidateOnAnimation();
}
+ if (shouldDismissOnScroll()) {
+ scrollOffBottom();
+ }
+
}
break;
@@ -484,6 +504,7 @@
// We want to use the same amount of alpha on the new tint color as the previous tint color.
final int edgeEffectAlpha = Color.alpha(mEdgeGlowBottom.getColor());
mEdgeGlowBottom.setColor((color & 0xffffff) | Color.argb(edgeEffectAlpha, 0, 0, 0));
+ mEdgeGlowTop.setColor(mEdgeGlowBottom.getColor());
}
/**
@@ -530,31 +551,43 @@
}
private void onDragFinished(int flingDelta) {
- if (!snapToTop(flingDelta)) {
+ if (getTransparentViewHeight() <= 0) {
+ // Don't perform any snapping if quick contacts is full screen.
+ return;
+ }
+ if (!snapToTopOnDragFinished(flingDelta)) {
// The drag/fling won't result in the content at the top of the Window. Consider
// snapping the content to the bottom of the window.
- snapToBottom(flingDelta);
+ snapToBottomOnDragFinished();
}
}
/**
* If needed, snap the subviews to the top of the Window.
+ *
+ * @return TRUE if QuickContacts will snap/fling to to top after this method call.
*/
- private boolean snapToTop(int flingDelta) {
- if (mHasEverTouchedTheTop) {
- // Only when first interacting with QuickContacts should QuickContacts snap to the top
- // of the screen. After this, QuickContacts can be placed most anywhere on the screen.
+ private boolean snapToTopOnDragFinished(int flingDelta) {
+ if (!mHasEverTouchedTheTop) {
+ // If the current fling is predicted to scroll past the top, then we don't need to snap
+ // to the top. However, if the fling only flings past the top by a tiny amount,
+ // it will look nicer to snap than to fling.
+ final float predictedScrollPastTop = getTransparentViewHeight() - flingDelta;
+ if (predictedScrollPastTop < -mSnapToTopSlopHeight) {
+ return false;
+ }
+
+ if (getTransparentViewHeight() <= mTransparentStartHeight) {
+ // We are above the starting scroll position so snap to the top.
+ mScroller.forceFinished(true);
+ smoothScrollBy(getTransparentViewHeight());
+ return true;
+ }
return false;
}
- final int requiredScroll = -getScroll_ignoreOversizedHeaderForSnapping()
- + mTransparentStartHeight;
- if (-getScroll_ignoreOversizedHeaderForSnapping() - flingDelta < 0
- && -getScroll_ignoreOversizedHeaderForSnapping() - flingDelta >
- -mTransparentStartHeight && requiredScroll != 0) {
- // We finish scrolling above the empty starting height, and aren't projected
- // to fling past the top of the Window, so elastically snap the empty space shut.
+ if (getTransparentViewHeight() < mDismissDistanceOnRelease) {
mScroller.forceFinished(true);
- smoothScrollBy(requiredScroll);
+ smoothScrollBy(getTransparentViewHeight());
return true;
}
return false;
@@ -563,36 +596,27 @@
/**
* If needed, scroll all the subviews off the bottom of the Window.
*/
- private void snapToBottom(int flingDelta) {
+ private void snapToBottomOnDragFinished() {
if (mHasEverTouchedTheTop) {
- // If QuickContacts has touched the top of the screen previously, then we
- // will less aggressively snap to the bottom of the screen.
- final float predictedScrollPastTop = -getScroll() + mTransparentStartHeight
- - flingDelta;
- final boolean isLandscape = getResources().getConfiguration().orientation
- == Configuration.ORIENTATION_LANDSCAPE;
- if (isLandscape) {
- // In landscape orientation, we dismiss the QC once it goes below the starting
- // starting offset that is used when QC starts in collapsed mode.
- if (predictedScrollPastTop > mTransparentStartHeight) {
- scrollOffBottom();
- }
- } else {
- // In portrait orientation, we dismiss the QC once it goes below
- // mIntermediateHeaderHeight within the bottom of the screen.
- final float heightMinusHeader = getHeight() - mIntermediateHeaderHeight;
- if (predictedScrollPastTop > heightMinusHeader) {
- scrollOffBottom();
- }
+ if (getTransparentViewHeight() > mDismissDistanceOnRelease) {
+ scrollOffBottom();
}
return;
}
- if (-getScroll() - flingDelta > 0) {
+ if (getTransparentViewHeight() > mTransparentStartHeight) {
scrollOffBottom();
}
}
/**
+ * Returns TRUE if we have scrolled far QuickContacts far enough that we should dismiss it
+ * without waiting for the user to finish their drag.
+ */
+ private boolean shouldDismissOnScroll() {
+ return mHasEverTouchedTheTop && getTransparentViewHeight() > mDismissDistanceOnScroll;
+ }
+
+ /**
* Return ratio of non-transparent:viewgroup-height for this viewgroup at the starting position.
*/
public float getStartingTransparentHeightRatio() {
@@ -606,6 +630,7 @@
}
public void scrollOffBottom() {
+ mIsTouchDisabledForDismissAnimation = true;
final Interpolator interpolator = new AcceleratingFlingInterpolator(
EXIT_FLING_ANIMATION_DURATION_MS, getCurrentVelocity(),
getScrollUntilOffBottom());
@@ -769,7 +794,7 @@
@Override
public void computeScroll() {
if (mScroller.computeScrollOffset()) {
- // Examine the fling results in order to activate EdgeEffect when we fling to the end.
+ // Examine the fling results in order to activate EdgeEffect and halt flings.
final int oldScroll = getScroll();
scrollTo(0, mScroller.getCurrY());
final int delta = mScroller.getCurrY() - oldScroll;
@@ -777,13 +802,21 @@
if (delta > distanceFromMaxScrolling && distanceFromMaxScrolling > 0) {
mEdgeGlowBottom.onAbsorb((int) mScroller.getCurrVelocity());
}
-
+ if (mIsFullscreenDownwardsFling && getTransparentViewHeight() > 0) {
+ // Halt the fling once QuickContact's top is on screen.
+ scrollTo(0, getScroll() + getTransparentViewHeight());
+ mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity());
+ mScroller.abortAnimation();
+ mIsFullscreenDownwardsFling = false;
+ }
if (!awakenScrollBars()) {
// Keep on drawing until the animation has finished.
postInvalidateOnAnimation();
}
if (mScroller.getCurrY() >= getMaximumScrollUpwards()) {
+ // Halt the fling once QuickContact's bottom is on screen.
mScroller.abortAnimation();
+ mIsFullscreenDownwardsFling = false;
}
}
}
@@ -792,10 +825,11 @@
public void draw(Canvas canvas) {
super.draw(canvas);
+ final int width = getWidth() - getPaddingLeft() - getPaddingRight();
+ final int height = getHeight();
+
if (!mEdgeGlowBottom.isFinished()) {
final int restoreCount = canvas.save();
- final int width = getWidth() - getPaddingLeft() - getPaddingRight();
- final int height = getHeight();
// Draw the EdgeEffect on the bottom of the Window (Or a little bit below the bottom
// of the Window if we start to scroll upwards while EdgeEffect is visible). This
@@ -819,6 +853,22 @@
}
canvas.restoreToCount(restoreCount);
}
+
+ if (!mEdgeGlowTop.isFinished()) {
+ final int restoreCount = canvas.save();
+ if (mIsTwoPanel) {
+ mEdgeGlowTop.setSize(mScrollView.getWidth(), height);
+ if (!isLayoutRtl()) {
+ canvas.translate(mPhotoViewContainer.getWidth(), 0);
+ }
+ } else {
+ mEdgeGlowTop.setSize(width, height);
+ }
+ if (mEdgeGlowTop.draw(canvas)) {
+ postInvalidateOnAnimation();
+ }
+ canvas.restoreToCount(restoreCount);
+ }
}
private float getCurrentVelocity() {
@@ -830,13 +880,13 @@
}
private void fling(float velocity) {
- if (Math.abs(mMaximumVelocity) < Math.abs(velocity)) {
- velocity = -mMaximumVelocity * Math.signum(velocity);
- }
// For reasons I do not understand, scrolling is less janky when maxY=Integer.MAX_VALUE
// then when maxY is set to an actual value.
mScroller.fling(0, getScroll(), 0, (int) velocity, 0, 0, -Integer.MAX_VALUE,
Integer.MAX_VALUE);
+ if (velocity < 0 && mTransparentView.getHeight() <= 0) {
+ mIsFullscreenDownwardsFling = true;
+ }
invalidate();
}
@@ -983,17 +1033,9 @@
*/
private void calculateCollapsedLargeTitlePadding() {
final Rect largeTextViewRect = new Rect();
- final Rect invisiblePlaceholderTextViewRect = new Rect();
mToolbar.getBoundsOnScreen(largeTextViewRect);
+ final Rect invisiblePlaceholderTextViewRect = new Rect();
mInvisiblePlaceholderTextView.getBoundsOnScreen(invisiblePlaceholderTextViewRect);
- if (isLayoutRtl()) {
- mCollapsedTitleStartMargin = largeTextViewRect.right
- - invisiblePlaceholderTextViewRect.right;
- } else {
- mCollapsedTitleStartMargin = invisiblePlaceholderTextViewRect.left
- - largeTextViewRect.left;
- }
-
// Distance between top of toolbar to the center of the target rectangle.
final int desiredTopToCenter = (
invisiblePlaceholderTextViewRect.top + invisiblePlaceholderTextViewRect.bottom)
@@ -1033,9 +1075,7 @@
}
private void updatePhotoTintAndDropShadow() {
- // Let's keep an eye on how long this method takes to complete. Right now, it takes ~0.2ms
- // on a Nexus 5. If it starts to get much slower, there are a number of easy optimizations
- // available.
+ // Let's keep an eye on how long this method takes to complete.
Trace.beginSection("updatePhotoTintAndDropShadow");
if (mIsTwoPanel && !mPhotoView.isBasedOffLetterTile()) {
@@ -1058,68 +1098,75 @@
// Reuse an existing mColorFilter (to avoid GC pauses) to change the photo's tint.
mPhotoView.clearColorFilter();
-
- // Ratio of current size to maximum size of the header.
- final float ratio;
- // The value that "ratio" will have when the header is at its starting/intermediate size.
- final float intermediateRatio = calculateHeightRatio((int)
- (mMaximumPortraitHeaderHeight * INTERMEDIATE_HEADER_HEIGHT_RATIO));
- if (!mIsTwoPanel) {
- ratio = calculateHeightRatio(toolbarHeight);
- } else {
- // We want the ratio and intermediateRatio to have the *approximate* values
- // they would have in portrait mode when at the intermediate position.
- ratio = intermediateRatio;
- }
-
- final float linearBeforeMiddle = Math.max(1 - (1 - ratio) / intermediateRatio, 0);
-
- // Want a function with a derivative of 0 at x=0. I don't want it to grow too
- // slowly before x=0.5. x^1.1 satisfies both requirements.
- final float EXPONENT_ALMOST_ONE = 1.1f;
- final float semiLinearBeforeMiddle = (float) Math.pow(linearBeforeMiddle,
- EXPONENT_ALMOST_ONE);
mColorMatrix.reset();
- mColorMatrix.setSaturation(semiLinearBeforeMiddle);
- mColorMatrix.postConcat(alphaMatrix(
- 1 - mWhiteBlendingPathInterpolator.getInterpolation(1 - ratio), Color.WHITE));
- final float colorAlpha;
- if (mPhotoView.isBasedOffLetterTile()) {
- // Since the letter tile only has white and grey, tint it more slowly. Otherwise
- // it will be completely invisible before we reach the intermediate point. The values
- // for TILE_EXPONENT and slowingFactor are chosen to achieve DESIRED_INTERMEDIATE_ALPHA
- // at the intermediate/starting position.
- final float DESIRED_INTERMEDIATE_ALPHA = 0.9f;
- final float TILE_EXPONENT = 1.5f;
- final float slowingFactor = (float) ((1 - intermediateRatio) / intermediateRatio
- / (1 - Math.pow(1 - DESIRED_INTERMEDIATE_ALPHA, 1/TILE_EXPONENT)));
- float linearBeforeMiddleish = Math.max(1 - (1 - ratio) / intermediateRatio
- / slowingFactor, 0);
- colorAlpha = 1 - (float) Math.pow(linearBeforeMiddleish, TILE_EXPONENT);
- mColorMatrix.postConcat(alphaMatrix(colorAlpha, mHeaderTintColor));
+ final int gradientAlpha;
+ if (!mPhotoView.isBasedOffLetterTile()) {
+ // Constants and equations were arbitrarily picked to choose values for saturation,
+ // whiteness, tint and gradient alpha. There were four main objectives:
+ // 1) The transition period between the unmodified image and fully colored image should
+ // be very short.
+ // 2) The tinting should be fully applied even before the background image is fully
+ // faded out and desaturated. Why? A half tinted photo looks bad and results in
+ // unappealing colors.
+ // 3) The function should have a derivative of 0 at ratio = 1 to avoid discontinuities.
+ // 4) The entire process should look awesome.
+ final float ratio = calculateHeightRatioToBlendingStartHeight(toolbarHeight);
+ final float alpha = 1.0f - (float) Math.min(Math.pow(ratio, 1.5f) * 2f, 1f);
+ final float tint = (float) Math.min(Math.pow(ratio, 1.5f) * 3f, 1f);
+ mColorMatrix.setSaturation(alpha);
+ mColorMatrix.postConcat(alphaMatrix(alpha, Color.WHITE));
+ mColorMatrix.postConcat(multiplyBlendMatrix(mHeaderTintColor, tint));
+ gradientAlpha = (int) (255 * alpha);
+ } else if (mIsTwoPanel) {
+ mColorMatrix.reset();
+ mColorMatrix.postConcat(alphaMatrix(DESIRED_INTERMEDIATE_LETTER_TILE_ALPHA,
+ mHeaderTintColor));
+ gradientAlpha = 0;
} else {
- colorAlpha = 1 - semiLinearBeforeMiddle;
- mColorMatrix.postConcat(multiplyBlendMatrix(mHeaderTintColor, colorAlpha));
+ // We want a function that has DESIRED_INTERMEDIATE_LETTER_TILE_ALPHA value
+ // at the intermediate position and uses TILE_EXPONENT. Finding an equation
+ // that satisfies this condition requires the following arithmetic.
+ final float ratio = calculateHeightRatioToFullyOpen(toolbarHeight);
+ final float intermediateRatio = calculateHeightRatioToFullyOpen((int)
+ (mMaximumPortraitHeaderHeight * INTERMEDIATE_HEADER_HEIGHT_RATIO));
+ final float TILE_EXPONENT = 3f;
+ final float slowingFactor = (float) ((1 - intermediateRatio) / intermediateRatio
+ / (1 - Math.pow(1 - DESIRED_INTERMEDIATE_LETTER_TILE_ALPHA, 1/TILE_EXPONENT)));
+ float linearBeforeIntermediate = Math.max(1 - (1 - ratio) / intermediateRatio
+ / slowingFactor, 0);
+ float colorAlpha = 1 - (float) Math.pow(linearBeforeIntermediate, TILE_EXPONENT);
+ mColorMatrix.postConcat(alphaMatrix(colorAlpha, mHeaderTintColor));
+ gradientAlpha = 0;
}
+ // TODO: remove re-allocation of ColorMatrixColorFilter objects (b/17627000)
mPhotoView.setColorFilter(new ColorMatrixColorFilter(mColorMatrix));
+
// Tell the photo view what tint we are trying to achieve. Depending on the type of
// drawable used, the photo view may or may not use this tint.
mPhotoView.setTint(mHeaderTintColor);
-
- final int gradientAlpha = (int) (255 * linearBeforeMiddle);
mTitleGradientDrawable.setAlpha(gradientAlpha);
mActionBarGradientDrawable.setAlpha(gradientAlpha);
Trace.endSection();
}
- private float calculateHeightRatio(int height) {
+ private float calculateHeightRatioToFullyOpen(int height) {
return (height - mMinimumPortraitHeaderHeight)
/ (float) (mMaximumPortraitHeaderHeight - mMinimumPortraitHeaderHeight);
}
+ private float calculateHeightRatioToBlendingStartHeight(int height) {
+ final float intermediateHeight = mMaximumPortraitHeaderHeight
+ * COLOR_BLENDING_START_RATIO;
+ final float interpolatingHeightRange = intermediateHeight - mMinimumPortraitHeaderHeight;
+ if (height > intermediateHeight) {
+ return 0;
+ }
+ return (intermediateHeight - height) / interpolatingHeightRange;
+ }
+
/**
* Simulates alpha blending an image with {@param color}.
*/
@@ -1157,18 +1204,21 @@
}
private boolean motionShouldStartDrag(MotionEvent event) {
- final float deltaX = event.getX() - mLastEventPosition[0];
final float deltaY = event.getY() - mLastEventPosition[1];
- final boolean draggedX = (deltaX > mTouchSlop || deltaX < -mTouchSlop);
- final boolean draggedY = (deltaY > mTouchSlop || deltaY < -mTouchSlop);
- return draggedY && !draggedX;
+ return deltaY > mTouchSlop || deltaY < -mTouchSlop;
}
private float updatePositionAndComputeDelta(MotionEvent event) {
final int VERTICAL = 1;
final float position = mLastEventPosition[VERTICAL];
updateLastEventPosition(event);
- return position - mLastEventPosition[VERTICAL];
+ float elasticityFactor = 1;
+ if (position < mLastEventPosition[VERTICAL] && mHasEverTouchedTheTop) {
+ // As QuickContacts is dragged from the top of the window, its rate of movement will
+ // slow down in proportion to its distance from the top. This will feel springy.
+ elasticityFactor += mTransparentView.getHeight() * SPRING_DAMPENING_FACTOR;
+ }
+ return (position - mLastEventPosition[VERTICAL]) / elasticityFactor;
}
private void smoothScrollBy(int delta) {
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 84dc748..0fbd312 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -21,7 +21,6 @@
import android.content.Intent;
import android.content.Loader;
import android.net.Uri;
-import android.os.AsyncTask;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Directory;
@@ -68,11 +67,6 @@
public class PeopleActivityTest
extends ActivityInstrumentationTestCase2<PeopleActivity>
{
- static {
- // AsyncTask class needs to be initialized on the main thread.
- AsyncTask.init();
- }
-
private static final String TEST_ACCOUNT = "testAccount";
private static final String TEST_ACCOUNT_TYPE = "testAccountType";
diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
index 5932c87..0d62376 100644
--- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
@@ -18,7 +18,6 @@
import android.content.ContentUris;
import android.net.Uri;
-import android.os.AsyncTask;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Contacts.Entity;
import android.test.ActivityInstrumentationTestCase2;
@@ -50,12 +49,6 @@
@SmallTest
public class ContactDeletionInteractionTest
extends ActivityInstrumentationTestCase2<FragmentTestActivity> {
-
- static {
- // AsyncTask class needs to be initialized on the main thread.
- AsyncTask.init();
- }
-
private static final Uri CONTACT_URI = ContentUris.withAppendedId(Contacts.CONTENT_URI, 13);
private static final Uri ENTITY_URI = Uri.withAppendedPath(
CONTACT_URI, Entity.CONTENT_DIRECTORY);
