Merge "Fix NullPointerException when set profile photo"
diff --git a/Android.mk b/Android.mk
index e629e54..57d521e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,9 +46,7 @@
android-support-v4 \
com.android.vcard \
guava \
- libphonenumber \
- legacy-android-test \
- junit
+ libphonenumber
LOCAL_PACKAGE_NAME := Contacts
LOCAL_CERTIFICATE := shared
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58209ae..93b9a70 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10710"
- android:versionName="1.7.10">
+ android:versionCode="10721"
+ android:versionName="1.7.21">
<uses-sdk
android:minSdkVersion="21"
diff --git a/proguard.flags b/proguard.flags
index 75fbfd7..07ec5d2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -2,6 +2,11 @@
public <init>(...);
}
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontwarn android.support.**
+
# Xml files containing onClick (menus and layouts) require that proguard not
# remove their handlers.
-keepclassmembers class * extends android.app.Activity {
diff --git a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml
similarity index 82%
rename from res/mipmap-anydpi-v26/ic_contacts_launcher.xml
rename to res/drawable-anydpi-v26/ic_add_contact_shortcut.xml
index 784f6e3..fbd7a09 100644
--- a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
+++ b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/ic_contacts_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_contacts_launcher_foreground"/>
+ <background android:drawable="@color/ic_add_contact_shortcut_background"/>
+ <foreground android:drawable="@drawable/ic_add_circle_24dp"/>
</adaptive-icon>
\ No newline at end of file
diff --git a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png b/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 078c8a8..0000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png b/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 9d25e3d..0000000
--- a/res/drawable-hdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_144.png b/res/drawable-hdpi/product_logo_contacts_color_144.png
index d26a363..293a85e 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-hdpi/product_logo_contacts_color_192.png b/res/drawable-hdpi/product_logo_contacts_color_192.png
index ebd8a8b..04a5a10 100644
--- a/res/drawable-hdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-hdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png b/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index a045dab..0000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png b/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index d1181a9..0000000
--- a/res/drawable-mdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_144.png b/res/drawable-mdpi/product_logo_contacts_color_144.png
index e28097c..27c571e 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-mdpi/product_logo_contacts_color_192.png b/res/drawable-mdpi/product_logo_contacts_color_192.png
index a8fcbf0..6e79412 100644
--- a/res/drawable-mdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-mdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
index 5cc35d5..0272a01 100755
--- a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
+++ b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
android:gravity="center"
android:src="@drawable/product_logo_contacts_color_192" />
</item>
- <item
- android:id="@+id/launchscreens_logo_text"
- android:bottom="@dimen/launchscreens_google_logo_bottom">
- <bitmap
- android:gravity="center_horizontal|bottom"
- android:src="@drawable/googlelogo_dark20_color_184x60" />
- </item>
</layer-list>
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 437f083..0000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 2bd813f..0000000
--- a/res/drawable-xhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_144.png b/res/drawable-xhdpi/product_logo_contacts_color_144.png
index ebd8a8b..04a5a10 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xhdpi/product_logo_contacts_color_192.png b/res/drawable-xhdpi/product_logo_contacts_color_192.png
index 690bbd0..35d80e4 100644
--- a/res/drawable-xhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index b22fba6..0000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 6e4193e..0000000
--- a/res/drawable-xxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
index 8ff6a14..12c582b 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
index c32d9cd..baa0003 100644
--- a/res/drawable-xxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
deleted file mode 100644
index 7372b47..0000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_132x44.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png b/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
deleted file mode 100644
index 60de38b..0000000
--- a/res/drawable-xxxhdpi/googlelogo_dark20_color_184x60.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
index c32d9cd..baa0003 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_144.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
index 1346cbc..f1a62e6 100644
--- a/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
+++ b/res/drawable-xxxhdpi/product_logo_contacts_color_192.png
Binary files differ
diff --git a/res/drawable/ic_add_circle_24dp.xml b/res/drawable/ic_add_circle_24dp.xml
index ae37470..ebaab34 100644
--- a/res/drawable/ic_add_circle_24dp.xml
+++ b/res/drawable/ic_add_circle_24dp.xml
@@ -20,7 +20,7 @@
android:width="24dp"
android:viewportHeight="192.0"
android:viewportWidth="192.0">
- <path android:fillColor="#F5F5F5"
+ <path android:fillColor="@color/ic_add_contact_shortcut_background"
android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
<path android:fillColor="#039BE5"
android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
diff --git a/res/drawable/ic_add_contact_shortcut.xml b/res/drawable/ic_add_contact_shortcut.xml
new file mode 100644
index 0000000..85a7e61
--- /dev/null
+++ b/res/drawable/ic_add_contact_shortcut.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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 copy of ic_add_circle_24dp for use in pre O devices. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="192.0"
+ android:viewportWidth="192.0">
+ <path android:fillColor="@color/ic_add_contact_shortcut_background"
+ android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
+ <path android:fillColor="#039BE5"
+ android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
+</vector>
diff --git a/res/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml
index bacfe69..d30e8e1 100644
--- a/res/drawable/ic_work_profile.xml
+++ b/res/drawable/ic_work_profile.xml
@@ -1,17 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="16dp"
- android:height="16dp"
- android:viewportWidth="48"
- android:viewportHeight="48">
-
- <!-- //java/com/google/android/assets/quantum:ic_enterprise_grey600_16 -->
-
+ android:width="16dp"
+ android:height="16dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
- android:fillColor="#757575"
- android:pathData="M28 33h-8v-3H6v8c0 2.2 1.8 4 4 4h28c2.2 0 4-1.8
-4-4v-8H28v3zm12-21h-7V9l-3-3H18l-3 3.1V12H8c-2.2 0-4 1.8-4 4v8c0 2.2 1.8 4 4
-4h12v-3h8v3h12c2.2 0 4-1.8 4-4v-8c0-2.2-1.8-4-4-4zm-10 0H18V9h12v3z" />
- <path
- android:pathData="M0 0h48v48H0z" />
+ android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"
+ android:fillColor="#7F7F7F"/>
</vector>
diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml
index 1995899..276b2da 100755
--- a/res/drawable/quantum_launchscreen_contacts.xml
+++ b/res/drawable/quantum_launchscreen_contacts.xml
@@ -24,11 +24,4 @@
android:gravity="center"
android:src="@drawable/product_logo_contacts_color_144" />
</item>
- <item
- android:id="@+id/launchscreens_logo_text"
- android:bottom="@dimen/launchscreens_google_logo_bottom">
- <bitmap
- android:gravity="center_horizontal|bottom"
- android:src="@drawable/googlelogo_dark20_color_132x44" />
- </item>
</layer-list>
diff --git a/res/layout/expanding_entry_card_item.xml b/res/layout/expanding_entry_card_item.xml
index 99f9174..dbbeee5 100644
--- a/res/layout/expanding_entry_card_item.xml
+++ b/res/layout/expanding_entry_card_item.xml
@@ -88,8 +88,8 @@
<ImageView
android:id="@+id/third_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/default_clickable_icon_size"
+ android:layout_height="@dimen/default_clickable_icon_size"
android:layout_alignParentTop="true"
android:layout_toStartOf="@+id/icon_alternate"
android:layout_alignWithParentIfMissing="true"
@@ -102,8 +102,8 @@
<ImageView
android:id="@+id/icon_alternate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/default_clickable_icon_size"
+ android:layout_height="@dimen/default_clickable_icon_size"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:visibility="gone"
diff --git a/res/layout/select_dialog_item.xml b/res/layout/select_dialog_item.xml
index 1215aa9..05f2ae5 100644
--- a/res/layout/select_dialog_item.xml
+++ b/res/layout/select_dialog_item.xml
@@ -22,7 +22,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="wrap_content"
+ android:minHeight="56dp"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingEnd="24dp"
diff --git a/res/mipmap-hdpi/ic_contacts_launcher.png b/res/mipmap-hdpi/ic_contacts_launcher.png
index 0fd1492..64eff00 100644
--- a/res/mipmap-hdpi/ic_contacts_launcher.png
+++ b/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png b/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 8088777..0000000
--- a/res/mipmap-hdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher.png b/res/mipmap-mdpi/ic_contacts_launcher.png
index e23930b..b4ee821 100644
--- a/res/mipmap-mdpi/ic_contacts_launcher.png
+++ b/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png b/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index abea159..0000000
--- a/res/mipmap-mdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher.png b/res/mipmap-xhdpi/ic_contacts_launcher.png
index aff0f31..6feeadf 100644
--- a/res/mipmap-xhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 1fb6752..0000000
--- a/res/mipmap-xhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher.png b/res/mipmap-xxhdpi/ic_contacts_launcher.png
index 9cd2ebe..01a3fde 100644
--- a/res/mipmap-xxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index f1be7b1..0000000
--- a/res/mipmap-xxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
index 74c4179..328e067 100644
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png b/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
deleted file mode 100644
index 4b1a4b4..0000000
--- a/res/mipmap-xxxhdpi/ic_contacts_launcher_foreground.png
+++ /dev/null
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 48ac24b..897838a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kon nie kontakte vanaf SIM-kaart invoer nie"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Voer tans SIM in"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Kennisgewings"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nee"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0a29b4f..2e9a060 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ከ SIM ካርድ ዕውቂያዎች ማስመጣት አልተቻለም"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ሲም በማምጣት ላይ"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ማሳወቂያዎች"</string>
+ <string name="yes_button" msgid="1268479086848288060">"አዎ"</string>
+ <string name="no_button" msgid="5742815694687835125">"አይ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8e79099..97eb109 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -216,7 +216,7 @@
<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="5506832825256203208">"إنشاء جهة اتصال جديدة"</string>
- <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"الاطلاع على المزيد"</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="recent_card_title" msgid="8982782042698001695">"الأخيرة"</string>
<string name="about_card_title" msgid="2920942314212825637">"حول"</string>
@@ -266,7 +266,7 @@
<string name="navigation_drawer_label" msgid="4154758025620107419">"التصنيف <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"التصنيفات"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"الحسابات"</string>
- <string name="permission_explanation_header" msgid="5739405825039695327">"الاطلاع على المحادثات والأحداث التي جمعتكما"</string>
+ <string name="permission_explanation_header" msgid="5739405825039695327">"الاطّلاع على المحادثات والأحداث التي جمعتكما"</string>
<string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"الأحداث والرسائل"</string>
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"الأحداث"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"الرسائل"</string>
@@ -486,7 +486,7 @@
<string name="setting_about" msgid="7014388749752042863">"حول جهات الاتصال"</string>
<string name="share_favorite_contacts" msgid="4280926751003081042">"مشاركة جهات الاتصال المفضلة"</string>
<string name="share_contacts" msgid="8109287987498711664">"مشاركة جميع جهات الاتصال"</string>
- <string name="share_contacts_failure" msgid="1216431977330560559">"أخفقت مشاركة جهات الاتصال."</string>
+ <string name="share_contacts_failure" msgid="1216431977330560559">"تعذّرت مشاركة جهات الاتصال."</string>
<string name="dialog_export" msgid="1628001095187741417">"تصدير جهات الاتصال"</string>
<string name="dialog_import" msgid="2423592905927819672">"استيراد جهات اتصال من"</string>
<string name="share_error" msgid="948429331673358107">"لا يمكن مشاركة جهة الاتصال هذه."</string>
@@ -557,4 +557,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"تعذر استيراد جهات الاتصال من شريحة SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"استيراد SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"الإشعارات"</string>
+ <string name="yes_button" msgid="1268479086848288060">"نعم"</string>
+ <string name="no_button" msgid="5742815694687835125">"لا"</string>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 4482a9f..7ce1503 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktları SIM kartdan import etmək olmadı"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM import edilir"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirişlər"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Hə"</string>
+ <string name="no_button" msgid="5742815694687835125">"Yox"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d4d812c..fc5c553 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -216,7 +216,7 @@
<string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Nenaslovljeni događaj)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Podesi"</string>
- <string name="header_im_entry" msgid="3581720979640225615">"Razmena trenutnih poruka"</string>
+ <string name="header_im_entry" msgid="3581720979640225615">"Trenutne poruke"</string>
<string name="header_organization_entry" msgid="8515394955666265406">"Organizacija"</string>
<string name="header_nickname_entry" msgid="6743561883967451485">"Nadimak"</string>
<string name="header_note_entry" msgid="4320190426480612344">"Beleška"</string>
@@ -338,7 +338,7 @@
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefon"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"Imejl"</string>
<string name="postalLabelsGroup" msgid="3487738141112589324">"Adresa"</string>
- <string name="imLabelsGroup" msgid="3898238486262614027">"Razmena trenutnih poruka"</string>
+ <string name="imLabelsGroup" msgid="3898238486262614027">"Trenutne poruke"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizacija"</string>
<string name="relationLabelsGroup" msgid="1854373894284572781">"Odnos"</string>
<string name="eventLabelsGroup" msgid="7960408705307831289">"Poseban dan"</string>
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz nije uspeo"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Uvoz kontakata sa SIM kartice nije uspeo"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvozi se sa SIM-a"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obaveštenja"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c4f6730..1a31466 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -26,7 +26,7 @@
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Дадаць у кантакт"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Выберыце кантакт"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Выбраць"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Стварыць новы кантакт"</string>
+ <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Новы кантакт"</string>
<string name="searchHint" msgid="8482945356247760701">"Пошук кантактаў"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Дадаць у абраныя"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Выдаліць з абраных"</string>
@@ -187,9 +187,9 @@
<string name="clear_default" msgid="7193185801596678067">"Скінуць налады па змаўчанні"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Тэкст скапіяваны"</string>
<string name="cancel_confirmation_dialog_message" msgid="9008214737653278989">"Скасаваць змены?"</string>
- <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Адхіліць"</string>
+ <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Скасаваць"</string>
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"Скасаваць"</string>
- <string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Скасаваць карыст. выгляд?"</string>
+ <string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Скінуць налады?"</string>
<string name="enter_contact_name" msgid="4594274696120278368">"Пошук кантактаў"</string>
<string name="title_edit_group" msgid="8602752287270586734">"Выдаліць кантакты"</string>
<string name="local_profile_title" msgid="2021416826991393684">"Мой лакальны профіль"</string>
@@ -197,7 +197,7 @@
<string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Знайдзіце хвілінку, каб дадаць уліковы запіс, які дазволіць стварыць рэзервовую копію вашых кантактаў у Google."</string>
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Новыя кантакты будуць захаваны ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Выбраць уліковы запіс па змаўчанні для новых кантактаў:"</string>
- <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Стварыць новы кантакт"</string>
+ <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Новы кантакт"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Рэдагаваць кантакт"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Толькі прагляд"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Выбраць кантакт для рэдагавання"</string>
@@ -207,7 +207,7 @@
<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="5506832825256203208">"Стварыць новы кантакт"</string>
+ <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Новы кантакт"</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="recent_card_title" msgid="8982782042698001695">"Нядаўнія"</string>
@@ -258,7 +258,7 @@
<string name="navigation_drawer_label" msgid="4154758025620107419">"Метка <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Меткі"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Уліковыя запісы"</string>
- <string name="permission_explanation_header" msgid="5739405825039695327">"Паказваць усю гісторыю разам"</string>
+ <string name="permission_explanation_header" msgid="5739405825039695327">"Паказаць агульную гісторыю"</string>
<string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Падзеі і паведамленні"</string>
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Падзеі"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Паведамленні"</string>
@@ -390,9 +390,9 @@
<string name="announce_collapsed_fields" msgid="6414231530177338704">"Згорнута"</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"Усе кантакты"</string>
<string name="list_filter_all_starred" msgid="5031734941601931356">"Пазначана"</string>
- <string name="list_filter_customize" msgid="4789963356004169321">"Карыстальнiцкi"</string>
+ <string name="list_filter_customize" msgid="4789963356004169321">"Наладзіць"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Кантакт"</string>
- <string name="display_ungrouped" msgid="6885954210243119591">"Усе кантакты з тэчкі \"Іншыя\""</string>
+ <string name="display_ungrouped" msgid="6885954210243119591">"Усе іншыя кантакты"</string>
<string name="display_all_contacts" msgid="2031647544742889505">"Усе кантакты"</string>
<string name="menu_sync_remove" msgid="3266725887008450161">"Выдаліць групу сінхранізацыі"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"Дадаць групу сінхранізацыі"</string>
@@ -481,7 +481,7 @@
<string name="no_contact_to_share" msgid="1276397530378323033">"Няма кантактаў, якія можна абагуліць."</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Паказаць кантакты"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Адлюстроўваць кантакты"</string>
- <string name="custom_list_filter" msgid="9048525797111024204">"Наладзіць від"</string>
+ <string name="custom_list_filter" msgid="9048525797111024204">"Наладзіць прагляд"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Захаваць"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"Шукаць у кантактах"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Выбранае"</string>
@@ -542,6 +542,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Не ўдалося імпартаваць"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не ўдалося імпартаваць кантакты з SIM-карты"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпартаванне SIM"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Апавяшчэнні"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index af1b650..b64c873 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактите не можаха да се импортират от SIM картата"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импортира се от SIM картата"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известия"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+ <string name="no_button" msgid="5742815694687835125">"Не"</string>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index da6f384..1d5176a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -41,7 +41,7 @@
<string name="menu_renameGroup" msgid="7169512355179757182">"লেবেলের পুনঃনামকরণ করুন"</string>
<string name="menu_deleteGroup" msgid="1126469629233412249">"লেবেল মুছুন"</string>
<string name="menu_addToGroup" msgid="3267409983764370041">"পরিচিতি যোগ করুন"</string>
- <string name="menu_selectForGroup" msgid="3999234528229376098">"পরিচিতিগুলিকে নির্বাচন করুন"</string>
+ <string name="menu_selectForGroup" msgid="3999234528229376098">"পরিচিতিগুলিকে বেছে নিন"</string>
<string name="menu_addContactsToGroup" msgid="655196688840626483">"পরিচিতিগুলি যোগ করুন"</string>
<string name="menu_removeFromGroup" msgid="6720354305399961978">"লেবেল থেকে সরান"</string>
<string name="menu_new_group_action_bar" msgid="3127059073617415221">"লেবেল তৈরি করুন"</string>
@@ -55,7 +55,7 @@
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"লিঙ্কমুক্ত করা হচ্ছে"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"লিঙ্ক করুন"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"লিঙ্ক করা পরিচিতিগুলি দেখুন"</string>
- <string name="menu_save" msgid="1727844363591825909">"সংরক্ষণ করুন"</string>
+ <string name="menu_save" msgid="1727844363591825909">"সেভ করুন"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"পরিচিতিগুলি লিঙ্ক করুন"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"যে পরিচিতিটিকে <xliff:g id="NAME">%s</xliff:g> এর সাথে লিঙ্ক করতে চান বেছে নিন:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"প্রস্তাবিত পরিচিতিগুলি"</string>
@@ -152,7 +152,7 @@
<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="pick_new_photo" msgid="9122450996263688237">"নতুন ফটো বেছে নিন"</string>
<string name="search_results_searching" msgid="3984833028938569930">"অনুসন্ধান করছে..."</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"তারিখ"</string>
<string name="group_edit_field_hint_text" msgid="8038224059926963133">"লেবেল"</string>
@@ -190,7 +190,7 @@
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"নতুন পরিচিতিগুলি <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> এ সংরক্ষণ করা হবে৷"</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"নতুন পরিচিতিগুলির জন্য একটি ডিফল্ট অ্যাকাউন্ট বেছে নিন:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"নতুন পরিচিতি বানান"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"পরিচিতি সম্পাদনা করুন"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"পরিচিতি সম্পাদনা"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"কেবলমাত্র দেখার জন্য"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"সম্পাদনা করার জন্য একটি পরিচিতি বেছে নিন"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"লিঙ্ক করা পরিচিতিগুলি"</string>
@@ -200,8 +200,8 @@
<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="5506832825256203208">"নতুন পরিচিতি বানান"</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_more" msgid="3779194067124758079">"আরও দেখুন"</string>
+ <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"আরও কম"</string>
<string name="recent_card_title" msgid="8982782042698001695">"সাম্প্রতিক"</string>
<string name="about_card_title" msgid="2920942314212825637">"সম্পর্কে"</string>
<string name="toast_making_personal_copy" msgid="288549957278065542">"একটি ব্যক্তিগত অনুলিপি তৈরি করা হচ্ছে…"</string>
@@ -229,7 +229,7 @@
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"মিস করা"</string>
<string name="content_description_recent_call" msgid="5183800406316723676">"সাম্প্রতিক কল৷ <xliff:g id="CALL_TYPE">%1$s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>৷ <xliff:g id="DATE">%3$s</xliff:g>৷ ঘুরিয়ে কল করতে ক্লিক করুন"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"আপনি: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"আরো ফিল্ড"</string>
+ <string name="editor_more_fields" msgid="3630987771304393421">"আরও ফিল্ড"</string>
<string name="editor_change_photo_content_description" msgid="820879708069864340">"পরিচিতির ফটো পরিবর্তন করুন"</string>
<string name="editor_add_photo_content_description" msgid="4194479313465418120">"পরিচিতির ফটো যোগ করুন"</string>
<string name="editor_contact_photo_content_description" msgid="8571975622926162369">"পরিচিতির ফটো"</string>
@@ -372,9 +372,9 @@
<string name="chat_jabber" msgid="7561444230307829609">"Jabber ব্যবহার করে চ্যাট করুন"</string>
<string name="chat" msgid="9025361898797412245">"চ্যাট"</string>
<string name="description_minus_button" msgid="6908099247930477551">"মুছুন"</string>
- <string name="expand_name_fields_description" msgid="6948274252874552543">"আরো নামের ক্ষেত্রগুলি দেখান"</string>
+ <string name="expand_name_fields_description" msgid="6948274252874552543">"আরও নামের ক্ষেত্রগুলি দেখান"</string>
<string name="collapse_name_fields_description" msgid="4757877385895561556">"নামের ক্ষেত্রটিকে সঙ্কুচিত করুন"</string>
- <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"আরো ফোনেটিক নামের ক্ষেত্রগুলি দেখান"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"আরও ফোনেটিক নামের ক্ষেত্রগুলি দেখান"</string>
<string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"ফোনেটিক নামের ক্ষেত্রটিকে প্রসারিত করুন"</string>
<string name="expand_fields_description" msgid="8129294181216760037">"প্রসারিত করুন"</string>
<string name="collapse_fields_description" msgid="1884143625854637874">"সঙ্কুচিত করুন"</string>
@@ -388,11 +388,11 @@
<string name="display_all_contacts" msgid="2031647544742889505">"সকল পরিচিতি"</string>
<string name="menu_sync_remove" msgid="3266725887008450161">"সমন্বয় গোষ্ঠী সরান"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"সমন্বয় গোষ্ঠী যোগ করুন"</string>
- <string name="display_more_groups" msgid="2682547080423434170">"আরো গোষ্ঠী…"</string>
+ <string name="display_more_groups" msgid="2682547080423434170">"আরও গোষ্ঠী…"</string>
<string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"সমন্বয় থেকে \"<xliff:g id="GROUP">%s</xliff:g>\" সরানো হলে তা সমন্বয় থেকে যেকোনো অগোষ্ঠীবদ্ধ পরিচিতিগুলিকেও সরাবে৷"</string>
<string name="savingDisplayGroups" msgid="2133152192716475939">"প্রদর্শনের বিকল্পগুলি সংরক্ষণ করা হচ্ছে..."</string>
<string name="listCustomView" msgid="1840624396582117590">"কাস্টমাইজ করা দৃশ্য"</string>
- <string name="dialog_new_contact_account" msgid="4969619718062454756">"আমদানি করা পরিচিতিগুলি এতে সংরক্ষণ করুন:"</string>
+ <string name="dialog_new_contact_account" msgid="4969619718062454756">"আমদানি করা পরিচিতিগুলি এতে সেভ করুন:"</string>
<string name="import_from_sim" msgid="6912071635295799131">"সিম কার্ড"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"সিম <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -505,7 +505,7 @@
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"এই শর্টকাটটি অক্ষম করা হয়েছে"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"পরিচিতিটি সরানো হয়েছে"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"আমদানি করুন"</string>
- <string name="sim_import_title_none_selected" msgid="6910517331401970693">"পরিচিতিগুলি নির্বাচন করুন"</string>
+ <string name="sim_import_title_none_selected" msgid="6910517331401970693">"পরিচিতিগুলি বেছে নিন"</string>
<string name="sim_import_empty_message" msgid="7743815244380189651">"আপনার সিম কার্ডে কোনো পরিচিতি নেই"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"পরিচিতিটি ইতিমধ্যেই আপনার তালিকাতে রয়েছে"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
@@ -523,10 +523,12 @@
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"চালু করুন"</string>
<string name="connection_error_message" msgid="7046408921529247089">"কোনো সংযোগ নেই"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"সিম"</string>
- <string name="show_more_content_description" msgid="4277410425912984722">"আরো দেখান"</string>
+ <string name="show_more_content_description" msgid="4277410425912984722">"আরও দেখান"</string>
<string name="importing_sim_finished_title" msgid="5196369441294050721">"সিম কার্ড আমদানি করা সমাপ্ত হয়েছে"</string>
<string name="importing_sim_failed_title" msgid="39706901030537985">"আমদানি ব্যর্থ হয়েছে"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"সিম কার্ড থেকে পরিচিতিগুলি আমদানি করা গেল না"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"সিম আমদানি করা হচ্ছে"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"বিজ্ঞপ্তি"</string>
+ <string name="yes_button" msgid="1268479086848288060">"হ্যাঁ"</string>
+ <string name="no_button" msgid="5742815694687835125">"না"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index ea786b7..c14e050 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -22,12 +22,12 @@
<string name="shortcutContact" msgid="749243779392912958">"Kontakt"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Direktno biranje"</string>
<string name="shortcutMessageContact" msgid="2460337253595976198">"Direktna poruka"</string>
- <string name="shortcutActivityTitle" msgid="1504383567778497348">"Izaberi kontakt"</string>
+ <string name="shortcutActivityTitle" msgid="1504383567778497348">"Odaberi kontakt"</string>
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodaj u kontakt"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izaberi kontakt"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odaberi kontakt"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Odaberi"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Napravi novi kontakt"</string>
- <string name="searchHint" msgid="8482945356247760701">"Traži kontakte"</string>
+ <string name="searchHint" msgid="8482945356247760701">"Pretraži kontakte"</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>
@@ -57,7 +57,7 @@
<string name="menu_linkedContacts" msgid="400444389718855621">"Prikaz povezanih kontakata"</string>
<string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Poveži kontakte"</string>
- <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
+ <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Odaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
<string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> je povezan"</string>
@@ -127,7 +127,7 @@
<string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju brojeve telefona."</string>
<string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji poruku e-pošte"</string>
<string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
- <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Izaberite kontakte"</string>
+ <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Odaberite kontakte"</string>
<string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
<string name="listFoundAllContactsZero" msgid="922980883593159444">"Nema kontakata"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Dodati \"<xliff:g id="EMAIL">%s</xliff:g>\" u kontakte?"</string>
@@ -144,7 +144,7 @@
<item quantity="few">Podijeli kontakte putem</item>
<item quantity="other">Podijeli kontakte putem</item>
</plurals>
- <string name="dialog_new_group_account" msgid="3451312333591556651">"Izaberi račun"</string>
+ <string name="dialog_new_group_account" msgid="3451312333591556651">"Odaberi račun"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Napravi oznaku"</string>
<string name="group_name_dialog_update_title" msgid="6328021162869677383">"Preimenuj oznaku"</string>
<string name="group_name_dialog_hint" msgid="7624523157537700160">"Naziv oznake"</string>
@@ -155,7 +155,7 @@
<string name="google_account_type_format" msgid="5283997303922067997">"Račun <xliff:g id="SOURCE">%1$s</xliff:g>"</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">"Izaberi fotografiju"</string>
+ <string name="pick_photo" msgid="2129509985223564942">"Odaberi fotografiju"</string>
<string name="pick_new_photo" msgid="9122450996263688237">"Odaberi novu fotografiju"</string>
<string name="search_results_searching" msgid="3984833028938569930">"Pretraživanje…"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
@@ -186,17 +186,17 @@
<string name="cancel_confirmation_dialog_cancel_editing_button" msgid="3057023972074640671">"Odbaci"</string>
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"Otkaži"</string>
<string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"Odbaciti prilagođavanja?"</string>
- <string name="enter_contact_name" msgid="4594274696120278368">"Traži kontakte"</string>
+ <string name="enter_contact_name" msgid="4594274696120278368">"Pretraži kontakte"</string>
<string name="title_edit_group" msgid="8602752287270586734">"Ukloni kontakte"</string>
<string name="local_profile_title" msgid="2021416826991393684">"Moj lokalni profil"</string>
<string name="external_profile_title" msgid="8034998767621359438">"Moj profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
<string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Odvojite malo vremena da dodate račun putem kojeg će se kontakti sigurnosno kopirati na Google."</string>
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Novi kontakti će biti sačuvani na račun <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
- <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite zadani račun za nove kontakte:"</string>
+ <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Odaberite zadani račun za nove kontakte:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Napravi novi kontakt"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Uredi kontakt"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo prikaz"</string>
- <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za uređivanje"</string>
+ <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Odaberite kontakt za uređivanje"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Povezani kontakti"</string>
<string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Dodaj"</string>
<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Prekini povezanost"</string>
@@ -345,7 +345,7 @@
<string name="sms" msgid="1756857139634224222">"Tekstualna poruka"</string>
<string name="postal_address" msgid="8765560217149624536">"Adresa"</string>
<string name="ghostData_company" msgid="5414421120553765775">"Kompanija"</string>
- <string name="ghostData_title" msgid="7496735200318496110">"Naslov"</string>
+ <string name="ghostData_title" msgid="7496735200318496110">"Pozicija"</string>
<string name="label_notes" msgid="8337354953278341042">"Bilješke"</string>
<string name="label_custom_field" msgid="1994056912242214426">"Prilagođeno"</string>
<string name="label_sip_address" msgid="7252153678613978127">"SIP"</string>
@@ -477,7 +477,7 @@
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakti za prikaz"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"Prilagodi prikaz"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Sačuvaj"</string>
- <string name="hint_findContacts" msgid="7128627979899070325">"Traži kontakte"</string>
+ <string name="hint_findContacts" msgid="7128627979899070325">"Pretraži kontakte"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriti"</string>
<string name="menu_import" msgid="6107961135813836467">"Uvezi"</string>
<string name="menu_export" msgid="2658783911863503902">"Izvezi"</string>
@@ -535,6 +535,5 @@
<string name="importing_sim_failed_title" msgid="39706901030537985">"Uvoz nije uspio"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nije moguće uvesti kontakte sa SIM kartice"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz sa SIM kartice"</string>
- <!-- no translation found for contacts_default_notification_channel (4754058700611188581) -->
- <skip />
+ <string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavještenja"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index cf747c2..9d91b9e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -99,10 +99,10 @@
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Foto de contacte"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nom de camp personalitzat"</string>
<string name="removePhoto" msgid="4898105274130284565">"Suprimeix la foto"</string>
- <string name="noContacts" msgid="2228592924476426108">"La llista de contactes està buida"</string>
+ <string name="noContacts" msgid="2228592924476426108">"La llista de contactes és buida"</string>
<string name="emptyGroup" msgid="5102411903247859575">"No hi ha cap contacte amb aquesta etiqueta"</string>
<string name="emptyAccount" msgid="6873962901497975964">"No hi ha cap contacte en aquest compte"</string>
- <string name="emptyMainList" msgid="2772242747899664460">"La llista de contactes està buida"</string>
+ <string name="emptyMainList" msgid="2772242747899664460">"La llista de contactes és buida"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> s\'ha desat"</string>
<string name="contactSavedToast" msgid="9171862279493213075">"S\'ha desat el contacte"</string>
<string name="contactUnlinkedToast" msgid="7122823195786012553">"Els contactes s\'han desenllaçat"</string>
@@ -449,7 +449,7 @@
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordena per"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nom fonètic"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Mostra sempre"</string>
- <string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Amaga si està buit"</string>
+ <string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Amaga si és buit"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nom"</string>
<string name="display_options_sort_by_family_name" msgid="2684905041926954793">"Cognoms"</string>
<string name="display_options_view_names_as" msgid="6514632499276563482">"Format del nom"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No s\'han pogut importar els contactes de la targeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"S\'estan important els contactes de la SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacions"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b15320a..069c845 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -476,11 +476,11 @@
<string name="share_contacts" msgid="8109287987498711664">"Sdílet všechny kontakty"</string>
<string name="share_contacts_failure" msgid="1216431977330560559">"Kontakty se nepodařilo sdílet."</string>
<string name="dialog_export" msgid="1628001095187741417">"Exportovat kontakty"</string>
- <string name="dialog_import" msgid="2423592905927819672">"Importovat kontakty z umístění"</string>
+ <string name="dialog_import" msgid="2423592905927819672">"Importovat kontakty z:"</string>
<string name="share_error" msgid="948429331673358107">"Tento kontakt nelze sdílet."</string>
<string name="no_contact_to_share" msgid="1276397530378323033">"Nejsou dostupné žádné kontakty ke sdílení."</string>
- <string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakty k zobrazení"</string>
- <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakty k zobrazení"</string>
+ <string name="menu_contacts_filter" msgid="2165153460860262501">"Zobrazit kontakty"</string>
+ <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Zobrazit kontakty"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"Přizpůsobit zobrazení"</string>
<string name="menu_custom_filter_save" msgid="2679793632208086460">"Uložit"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"Vyhledejte kontakty"</string>
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakty ze SIM karty se nepodařilo importovat"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importování ze SIM karty"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Oznámení"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ano"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2381a4e..bae027d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -245,8 +245,8 @@
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Slet <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Forslag"</string>
<string name="menu_assistant_new_badge" msgid="3132884821616980034">"Nyt"</string>
- <string name="navigation_drawer_open" msgid="1126498472143250642">"Åbn navigationsskuffen"</string>
- <string name="navigation_drawer_close" msgid="4137416137011817930">"Luk navigationsskuffen"</string>
+ <string name="navigation_drawer_open" msgid="1126498472143250642">"Åbn sidemenuen"</string>
+ <string name="navigation_drawer_close" msgid="4137416137011817930">"Luk sidemenuen"</string>
<string name="navigation_drawer_label" msgid="4154758025620107419">"Etiketten <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Etiketter"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Konti"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktpersonerne kunne ikke importeres fra SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kortet importeres"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Underretninger"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nej"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3edd3b6..804cd7a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -324,9 +324,9 @@
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"Spitzname"</string>
<string name="name_given" msgid="4280790853455320619">"Vorname"</string>
<string name="name_family" msgid="7466985689626017037">"Nachname"</string>
- <string name="name_prefix" msgid="59756378548779822">"Namenpräfix"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Namenspräfix"</string>
<string name="name_middle" msgid="8467433655992690326">"Zweiter Vorname"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Namensuffix"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Namenssuffix"</string>
<string name="name_phonetic" msgid="4259595234312430484">"Phonetischer Name"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Vorname (phonetisch)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Zweiter Vorname (phonetisch)"</string>
@@ -359,7 +359,7 @@
<string name="postal_postcode" msgid="572136414136673751">"Postleitzahl"</string>
<string name="postal_country" msgid="7638264508416368690">"Land"</string>
<string name="map_home" msgid="1243547733423343982">"Privatadresse anzeigen"</string>
- <string name="map_work" msgid="1360474076921878088">"Geschäftsadresse anzeigen"</string>
+ <string name="map_work" msgid="1360474076921878088">"Arbeitsadresse anzeigen"</string>
<string name="map_other" msgid="3817820803587012641">"Adresse anzeigen"</string>
<string name="map_custom" msgid="8761800628069473526">"Adresse <xliff:g id="CUSTOM_LABEL">%s</xliff:g> anzeigen"</string>
<string name="chat_aim" msgid="2588492205291249142">"Über AIM chatten"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte konnten nicht von SIM-Karte importiert werden"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM wird importiert"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Benachrichtigungen"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nein"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 38c72b6..ea52f82 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Δεν ήταν δυνατή η εισαγωγή επαφών από την κάρτα SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Εισαγωγή από SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ειδοποιήσεις"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ναι"</string>
+ <string name="no_button" msgid="5742815694687835125">"Όχι"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d31ce21..0298097 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Couldn\'t import contacts from SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index deb32e9..eaad2c4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No se pudieron importar los contactos de la tarjeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando la tarjeta SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones."</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 07335de..302e97c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,7 +23,7 @@
<string name="shortcutDialContact" msgid="746622101599186779">"Llamada directa"</string>
<string name="shortcutMessageContact" msgid="2460337253595976198">"Mensaje directo"</string>
<string name="shortcutActivityTitle" msgid="1504383567778497348">"Elegir contacto"</string>
- <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Añadir al contacto"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Añadir a un contacto"</string>
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Elige un contacto"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Seleccionar"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Crear nuevo contacto"</string>
@@ -54,14 +54,14 @@
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Vinculando"</string>
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Desvinculando"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Vincular"</string>
- <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos enlazados"</string>
+ <string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos vinculados"</string>
<string name="menu_save" msgid="1727844363591825909">"Guardar"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Vincular contactos"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecciona el contacto que quieras vincular con <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
- <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> enlazado"</string>
- <string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos enlazados"</string>
+ <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> vinculado"</string>
+ <string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos vinculados"</string>
<string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Se ha eliminado a <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g> y a <xliff:g id="NAME_1">%2$s</xliff:g>"</string>
<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>…"</string>
@@ -108,7 +108,7 @@
<string name="contactUnlinkedToast" msgid="7122823195786012553">"Contactos desvinculados"</string>
<string name="contactSavedErrorToast" msgid="4827033473908688031">"No se han podido guardar los cambios en el contacto"</string>
<string name="contactUnlinkErrorToast" msgid="2706297508166952431">"No se ha podido desvincular el contacto"</string>
- <string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido enlazar el contacto"</string>
+ <string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido vincular el contacto"</string>
<string name="contactGenericErrorToast" msgid="3885457515665783976">"No se ha podido guardar el contacto"</string>
<string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"No se han podido guardar los cambios en la foto del contacto"</string>
<string name="groupLoadErrorToast" msgid="7536267148196064554">"No se ha podido cargar la etiqueta"</string>
@@ -193,7 +193,7 @@
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Solo lectura"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Seleccionar contacto para editarlo"</string>
- <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos enlazados"</string>
+ <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos vinculados"</string>
<string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Añadir"</string>
<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Desvincular"</string>
<string name="add_account" msgid="8201790677994503186">"Añadir cuenta"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"No se han podido importar los contactos de la tarjeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se está importando la tarjeta SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificaciones"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sí"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5a0f51f..f4c2c06 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -135,7 +135,7 @@
<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="menu_add_contacts" msgid="4465646512002163011">"Lisamine"</string>
+ <string name="menu_add_contacts" msgid="4465646512002163011">"Lisa"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
<item quantity="other">Kontaktide jagamine rakendusega</item>
<item quantity="one">Kontakti jagamine rakendusega</item>
@@ -194,7 +194,7 @@
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Vaid vaatamiseks"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Valige kontakt, mida soovite muuta"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Lingitud kontaktid"</string>
- <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Lisamine"</string>
+ <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Lisa"</string>
<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Link. tühistam."</string>
<string name="add_account" msgid="8201790677994503186">"Konto lisamine"</string>
<string name="add_new_account" msgid="5748627740680940264">"Lisa uus konto"</string>
@@ -445,8 +445,8 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt võeti vastu NFC kaudu"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Vahemällu salvestamine"</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Importimine: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
- <string name="export_to_vcf_file" msgid="4407527157056120858">"Eksportimine VCF-faili"</string>
- <string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortimisalus:"</string>
+ <string name="export_to_vcf_file" msgid="4407527157056120858">"Ekspordi VCF-faili"</string>
+ <string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortimisalus"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Foneetiline nimi"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Kuva alati"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Peida, kui see on tühi"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontakte ei õnnestunud SIM-kaardilt importida"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kaardi importimine"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Märguanded"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Jah"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ei"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d9f6e64..e8943af 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Ezin izan dira inportatu SIM txarteleko kontaktuak"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM txartela inportatzen"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Jakinarazpenak"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Bai"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ez"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 12a153f..4fcedb1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"مخاطبین از سیم کارت وارد نشدند"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"وارد کردن سیم کارت"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"اعلانها"</string>
+ <string name="yes_button" msgid="1268479086848288060">"بله"</string>
+ <string name="no_button" msgid="5742815694687835125">"نه"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a2f4a5f..997f6b4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Yhteystietojen tuominen SIM-kortilta epäonnistui."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Tuodaan SIM-kortin yhteystietoja"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ilmoitukset"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Kyllä"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ei"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 688e0cd..00b7ae8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -456,7 +456,7 @@
<string name="display_options_view_given_name_first" msgid="3616004640258761473">"Prénom en premier"</string>
<string name="display_options_view_family_name_first" msgid="956445100777296467">"Nom de famille en premier"</string>
<string name="settings_accounts" msgid="350219740670774576">"Comptes"</string>
- <string name="default_editor_account" msgid="699591683362420991">"Compte par défaut pour nouveaux contacts"</string>
+ <string name="default_editor_account" msgid="699591683362420991">"Compte par défaut pour les nouveaux contacts"</string>
<string name="settings_my_info_title" msgid="1534272456405343119">"Mon profil"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Configurer votre profil"</string>
<string name="setting_about" msgid="7014388749752042863">"À propos de Contacts"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer des contacts à partir de la carte SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation des contacts SIM en cours…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Avis"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Oui"</string>
+ <string name="no_button" msgid="5742815694687835125">"Non"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 20e412b..f9d6a28 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossible d\'importer les contacts depuis la carte SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation depuis la carte SIM..."</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifications"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Oui"</string>
+ <string name="no_button" msgid="5742815694687835125">"Non"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6abc4e7..70e6514 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -324,9 +324,9 @@
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"Alcume"</string>
<string name="name_given" msgid="4280790853455320619">"Nome"</string>
<string name="name_family" msgid="7466985689626017037">"Apelidos"</string>
- <string name="name_prefix" msgid="59756378548779822">"Tratamento do nome"</string>
+ <string name="name_prefix" msgid="59756378548779822">"Forma de tratamento"</string>
<string name="name_middle" msgid="8467433655992690326">"Segundo nome"</string>
- <string name="name_suffix" msgid="3855278445375651441">"Información profesional do nome"</string>
+ <string name="name_suffix" msgid="3855278445375651441">"Título académico ou profesional"</string>
<string name="name_phonetic" msgid="4259595234312430484">"Nome fonético"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Nome fonético"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Segundo nome fonético"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Non se puideron importar os contactos da tarxeta SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificacións"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Si"</string>
+ <string name="no_button" msgid="5742815694687835125">"Non"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 70ee150..e94cbad 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -110,7 +110,7 @@
<string name="contactUnlinkErrorToast" msgid="2706297508166952431">"સંપર્કને અનલિંક કરી શક્યા નથી"</string>
<string name="contactJoinErrorToast" msgid="5735129234573327701">"સંપર્ક લિંક કરી શક્યાં નથી"</string>
<string name="contactGenericErrorToast" msgid="3885457515665783976">"સંપર્ક સાચવવામાં ભૂલ"</string>
- <string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"સંપર્ક ફોટાના ફેરફારો સાચવી શક્યાં નથી"</string>
+ <string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"સંપર્ક ફોટોનાં ફેરફારો સાચવી શક્યાં નથી"</string>
<string name="groupLoadErrorToast" msgid="7536267148196064554">"લેબલ લોડ કરવામાં નિષ્ફળ થયાં"</string>
<string name="groupDeletedToast" msgid="520896687873262027">"લેબલ કાઢી નાખ્યું"</string>
<string name="groupCreatedToast" msgid="1924195126172834870">"લેબલ બનાવ્યું"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM કાર્ડમાંથી સંપર્કો આયાત કરી શક્યાં નથી"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM આયાત કરી રહ્યાં છે"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"સૂચનાઓ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"હા"</string>
+ <string name="no_button" msgid="5742815694687835125">"ના"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9326229..d1ccfcb 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -240,7 +240,7 @@
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"अभी नहीं"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"यह संपर्क"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"संभावित कॉपी"</string>
- <string name="suggestion_card_help_message" msgid="4474061044387181093">"हो सकता है कि ये संपर्क एक ही व्यक्ति हो. आप उन्हें एकल संपर्क के रूप में एक साथ लिंक कर सकते हैं."</string>
+ <string name="suggestion_card_help_message" msgid="4474061044387181093">"हो सकता है कि ये संपर्क एक ही व्यक्ति हो. आप उन्हें एक ही संपर्क के रूप में एक साथ लिंक कर सकते हैं."</string>
<string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> हटाएं"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> हटाएं"</string>
<string name="menu_assistant" msgid="5760693735722052454">"सुझाव"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्ड से संपर्क आयात नहीं किए जा सके"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM को आयात किया जा रहा है"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"नोटिफ़िकेशन"</string>
+ <string name="yes_button" msgid="1268479086848288060">"हां"</string>
+ <string name="no_button" msgid="5742815694687835125">"नहीं"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 109bdbd..05fbba1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Uvoz kontakata sa SIM kartice nije moguć"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz SIM kontakata"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obavijesti"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 551e3c6..9b2ee94 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -200,8 +200,8 @@
<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="action_menu_add_new_contact_button" msgid="5506832825256203208">"Új névjegy létrehozá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_more" msgid="3779194067124758079">"Több"</string>
+ <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Kevesebb"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Legutóbbiak"</string>
<string name="about_card_title" msgid="2920942314212825637">"Névjegy"</string>
<string name="toast_making_personal_copy" msgid="288549957278065542">"Személyes másolat készítése..."</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nem sikerült importálni a névjegyeket a SIM-kártyáról"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kártya importálása folyamatban"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Értesítések"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Igen"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nem"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index b8fb7ea..9bec260 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM քարտի ներմուծում"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Ծանուցումներ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Այո"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ոչ"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cfc8607..6bfcb61 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,7 +52,7 @@
<string name="joinConfirmation" msgid="8262614843581924365">"Ingin menyimpan perubahan yang sudah dilakukan dan menautkan dengan kontak yang dipilih?"</string>
<string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Simpan dan Tautkan"</string>
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Menautkan"</string>
- <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan tautan"</string>
+ <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Membatalkan link"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"Tautkan"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"Lihat kontak yang ditautkan"</string>
<string name="menu_save" msgid="1727844363591825909">"Simpan"</string>
@@ -250,7 +250,7 @@
<string name="navigation_drawer_label" msgid="4154758025620107419">"Label <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
<string name="menu_title_groups" msgid="8356921831150278868">"Label"</string>
<string name="menu_title_filters" msgid="8210922220185114527">"Akun"</string>
- <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat riwayat bersama"</string>
+ <string name="permission_explanation_header" msgid="5739405825039695327">"Lihat histori bersama"</string>
<string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Acara dan pesan"</string>
<string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Acara"</string>
<string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Pesan"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimpor kontak dari kartu SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimpor SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifikasi"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ya"</string>
+ <string name="no_button" msgid="5742815694687835125">"Tidak"</string>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c94e07c..4d68b61 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Gat ekki flutt inn tengiliði af SIM-korti"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Flytur inn SIM-kort"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Tilkynningar"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Já"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nei"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 65d0101..52c7b65 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Impossibile importare i contatti dalla scheda SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importazione della SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notifiche"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sì"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 206a001..7a5fae2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"לא ניתן היה לייבא את אנשי הקשר מכרטיס ה-SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"הייבוא מכרטיס ה-SIM מתבצע"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"הודעות"</string>
+ <string name="yes_button" msgid="1268479086848288060">"כן"</string>
+ <string name="no_button" msgid="5742815694687835125">"לא"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ce25290..a3dac06 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM カードの連絡先をインポートできませんでした"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM からインポートしています"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+ <string name="yes_button" msgid="1268479086848288060">"はい"</string>
+ <string name="no_button" msgid="5742815694687835125">"いいえ"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 479c7a6..c751904 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -329,7 +329,7 @@
<string name="name_suffix" msgid="3855278445375651441">"სახელის სუფიქსი"</string>
<string name="name_phonetic" msgid="4259595234312430484">"სახელის ტრანსკრიფცია"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"სახელი (ტრანსკრიფცია)"</string>
- <string name="name_phonetic_middle" msgid="8643721493320405200">"მეორე სახელის ტრანსკრიფცია"</string>
+ <string name="name_phonetic_middle" msgid="8643721493320405200">"მეორე სახელი (ტრანსკრიფცია)"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"გვარი (ტრანსკრიფცია)"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"ტელეფონი"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"ელფოსტა"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ბარათიდან კონტაქტების იმპორტი ვერ შესრულდა"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"მიმდინარეობს SIM-ის იმპორტი"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"შეტყობინებები"</string>
+ <string name="yes_button" msgid="1268479086848288060">"დიახ"</string>
+ <string name="no_button" msgid="5742815694687835125">"არა"</string>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1c8e82d..a3dd957 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Контактілерді SIM картасынан импорттау мүмкін болмады"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM картасы импортталуда"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Хабарландырулар"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Иә"</string>
+ <string name="no_button" msgid="5742815694687835125">"Жоқ"</string>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 78c1780..7a49f8b 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"មិនអាចនាំចូលទំនាក់ទំនងពីស៊ីមកាតបានទេ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"កំពុងនាំចូលទំនាក់ទំនងពី SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ការជូនដំណឹង"</string>
+ <string name="yes_button" msgid="1268479086848288060">"បាទ/ចាស"</string>
+ <string name="no_button" msgid="5742815694687835125">"ទេ"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3625f84..a96eb44 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -100,7 +100,7 @@
<string name="customLabelPickerTitle" msgid="1081475101983255212">"ಕಸ್ಟಮ್ ಲೇಬಲ್ ಹೆಸರು"</string>
<string name="removePhoto" msgid="4898105274130284565">"ಫೋಟೋ ತೆಗೆದುಹಾಕಿ"</string>
<string name="noContacts" msgid="2228592924476426108">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
- <string name="emptyGroup" msgid="5102411903247859575">"ಈ ಲೇಬಲ್ ಹೊಂದಿರುವ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
+ <string name="emptyGroup" msgid="5102411903247859575">"ಈ ಲೇಬಲ್ನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
<string name="emptyAccount" msgid="6873962901497975964">"ಈ ಖಾತೆಯಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
<string name="emptyMainList" msgid="2772242747899664460">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಉಳಿಸಲಾಗಿದೆ"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ಸಿಮ್ ಕಾರ್ಡ್ನಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ಸಿಮ್ ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ಅಧಿಸೂಚನೆಗಳು"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ಹೌದು"</string>
+ <string name="no_button" msgid="5742815694687835125">"ಇಲ್ಲ"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 347aac7..c91009f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM 카드에서 연락처를 가져올 수 없습니다."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM 가져오는 중"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"알림"</string>
+ <string name="yes_button" msgid="1268479086848288060">"예"</string>
+ <string name="no_button" msgid="5742815694687835125">"아니요"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 1334789..f92dda8 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM-картадан байланыштар импорттолбой койду"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-картадан өткөрүлүп алынууда"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Эскертмелер"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ооба"</string>
+ <string name="no_button" msgid="5742815694687835125">"Жок"</string>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index baa5c6b..b16fb0f 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ບໍ່ສາມາດນຳເຂົ້າລາຍຊື່ຜູ້ຕິດຕໍ່ຈາກຊິມກາດໄດ້"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ກຳລັງນຳເຂົ້າຈາກ SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ການແຈ້ງເຕືອນ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ແມ່ນ"</string>
+ <string name="no_button" msgid="5742815694687835125">"ບໍ່"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 71d9740..42d90b9 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepavyko importuoti kontaktų iš SIM kortelės"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuojami SIM kortelės kontaktai"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pranešimai"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Taip"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 71c8329..fbdefda 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nevarēja importēt kontaktpersonas no SIM kartes."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Notiek SIM kartes importēšana"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Paziņojumi"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Jā"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nē"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b7b28db..196d097 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не можеше да се увезат контакти од SIM-картичката"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Се увезува SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Известувања"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+ <string name="no_button" msgid="5742815694687835125">"Не"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 597014c..6540a72 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -37,7 +37,7 @@
<string name="menu_change_photo" msgid="7769177631511496210">"ഫോട്ടോ മാറ്റുക"</string>
<string name="menu_create_contact_shortcut" msgid="1663022219127343858">"കുറുക്കുവഴി സൃഷ്ടിക്കുക"</string>
<string name="menu_splitAggregate" msgid="2627252205317945563">"അൺലിങ്കുചെയ്യുക"</string>
- <string name="menu_editGroup" msgid="6696843438454341063">"കോൺടാക്റ്റുകൾ നീക്കംചെയ്യൂ"</string>
+ <string name="menu_editGroup" msgid="6696843438454341063">"കോൺടാക്റ്റ് നീക്കംചെയ്യൂ"</string>
<string name="menu_renameGroup" msgid="7169512355179757182">"ലേബലിന്റെ പേരുമാറ്റുക"</string>
<string name="menu_deleteGroup" msgid="1126469629233412249">"ലേബല് ഇല്ലാതാക്കുക"</string>
<string name="menu_addToGroup" msgid="3267409983764370041">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
@@ -55,7 +55,7 @@
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"അൺലിങ്കുചെയ്യുന്നു"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"ലിങ്ക്"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"ലിങ്കുചെയ്ത കോൺടാക്റ്റുകൾ കാണുക"</string>
- <string name="menu_save" msgid="1727844363591825909">"സംരക്ഷിക്കുക"</string>
+ <string name="menu_save" msgid="1727844363591825909">"സംരക്ഷിക്കൂ"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"കോണ്ടാക്റ്റുകൾ ലിങ്കുചെയ്യൂ"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"<xliff:g id="NAME">%s</xliff:g> എന്നയാളുമായി ലിങ്കുചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്ന കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"നിര്ദ്ദേശിക്കുന്ന കോണ്ടാക്റ്റുകള്"</string>
@@ -183,7 +183,7 @@
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="3316573928085916146">"റദ്ദാക്കൂ"</string>
<string name="leave_customize_confirmation_dialog_message" msgid="4277114551206032979">"ഇഷ്ടാനുസൃതമാക്കലുകൾ നിരസിക്കണോ?"</string>
<string name="enter_contact_name" msgid="4594274696120278368">"കോണ്ടാക്റ്റുകള് തിരയുക"</string>
- <string name="title_edit_group" msgid="8602752287270586734">"കോൺടാക്റ്റുകൾ നീക്കംചെയ്യൂ"</string>
+ <string name="title_edit_group" msgid="8602752287270586734">"കോൺടാക്റ്റ് നീക്കംചെയ്യൂ"</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="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"കുറച്ചുസമയമെടുത്ത് ഒരു അക്കൗണ്ട് ചേർക്കുക, അത് Google-ൽ നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ ബായ്ക്കപ്പെടുക്കുന്നതിനിടയാക്കും."</string>
@@ -470,7 +470,7 @@
<string name="menu_contacts_filter" msgid="2165153460860262501">"ദൃശ്യമാക്കേണ്ട കോൺടാക്റ്റുകൾ"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"ദൃശ്യമാക്കേണ്ട കോൺടാക്റ്റുകൾ"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"കാഴ്ച ഇഷ്ടാനുസൃതമാക്കൂ"</string>
- <string name="menu_custom_filter_save" msgid="2679793632208086460">"സംരക്ഷിക്കുക"</string>
+ <string name="menu_custom_filter_save" msgid="2679793632208086460">"സംരക്ഷിക്കൂ"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"കോണ്ടാക്റ്റുകള് തിരയുക"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"പ്രിയപ്പെട്ടവ"</string>
<string name="menu_import" msgid="6107961135813836467">"ഇമ്പോർട്ടുചെയ്യുക"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"സിം കാർഡിൽ നിന്ന് കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"അറിയിപ്പുകൾ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"അതെ"</string>
+ <string name="no_button" msgid="5742815694687835125">"ഇല്ല"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 266ffd9..2c1a965 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM картнаас харилцагчдыг импортолж чадсангүй"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-г импорт хийж байна"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Мэдэгдэл"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Тийм"</string>
+ <string name="no_button" msgid="5742815694687835125">"Үгүй"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index cec4a15..12f9fc7 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -48,14 +48,14 @@
<string name="splitConfirmation" msgid="7342030840130187290">"एकाधिक संपर्कांमध्ये या संपर्काचा दुवा रद्द करायचा?"</string>
<string name="splitConfirmation_positive_button" msgid="9129409098807939699">"दुवा रद्द करा"</string>
<string name="splitConfirmationWithPendingChanges" msgid="7719062163511895696">"आपण आधीपासून केलेले बदल आपण जतन करू आणि एकाधिक संपर्कांमध्ये या संपर्काचा दुवा रद्द करू इच्छिता?"</string>
- <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"जतन करा आणि दुवा रद्द करा"</string>
+ <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"सेव्ह करा आणि दुवा रद्द करा"</string>
<string name="joinConfirmation" msgid="8262614843581924365">"आपण आधीपासून केलेले बदल आपण जतन करू आणि निवडलेल्या संपर्काशी दुवा जोडू इच्छिता?"</string>
- <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"जतन करा आणि दुवा जोडा"</string>
+ <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"सेव्ह करा आणि दुवा जोडा"</string>
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"दुवा साधत आहे"</string>
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"दुवा रद्द करत आहे"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"दुवा साधा"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"दुवा जोडलेले संपर्क"</string>
- <string name="menu_save" msgid="1727844363591825909">"जतन करा"</string>
+ <string name="menu_save" msgid="1727844363591825909">"सेव्ह करा"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"संपर्कांचा दुवा साधा"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"आपण <xliff:g id="NAME">%s</xliff:g> सह ज्या संपर्काचा दुवा जोडू इच्छिता तो निवडा:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सूचित संपर्क"</string>
@@ -103,7 +103,7 @@
<string name="emptyGroup" msgid="5102411903247859575">"या लेबलसह कोणतेही संपर्क नाहीत"</string>
<string name="emptyAccount" msgid="6873962901497975964">"या खात्यामध्ये कोणतेही संपर्क नाहीत"</string>
<string name="emptyMainList" msgid="2772242747899664460">"आपली संपर्क सूची रिक्त आहे"</string>
- <string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> जतन केले"</string>
+ <string name="contactSavedNamedToast" msgid="895136068894549611">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> सेव्ह केले"</string>
<string name="contactSavedToast" msgid="9171862279493213075">"संपर्क जतन केला"</string>
<string name="contactUnlinkedToast" msgid="7122823195786012553">"संपर्कांचा दुवा रद्द केला"</string>
<string name="contactSavedErrorToast" msgid="4827033473908688031">"संपर्क बदल जतन करणे शक्य झाले नाही"</string>
@@ -115,7 +115,7 @@
<string name="groupDeletedToast" msgid="520896687873262027">"लेबल हटविले"</string>
<string name="groupCreatedToast" msgid="1924195126172834870">"लेबल तयार केले"</string>
<string name="groupCreateFailedToast" msgid="4359093891863474299">"लेबल तयार करू शकत नाही"</string>
- <string name="groupUpdatedToast" msgid="3667977658676267687">"लेबल अद्यतनित केले"</string>
+ <string name="groupUpdatedToast" msgid="3667977658676267687">"लेबल अपडेट केले"</string>
<string name="groupMembersRemovedToast" msgid="3510563559799376603">"लेबल मधून काढले"</string>
<string name="groupMembersAddedToast" msgid="4824834898718972768">"लेबलमध्ये जोडले"</string>
<string name="groupSavedErrorToast" msgid="2355891714292740162">"लेबल बदल जतन करणे शक्य झाले नाही"</string>
@@ -187,7 +187,7 @@
<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="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Google वर आपल्या संपर्कांचा बॅक अप घेणारे खाते जोडण्यासाठी एक मिनिट घ्या."</string>
- <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"नवीन संपर्क <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> वर जतन केले जातील."</string>
+ <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"नवीन संपर्क <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> वर सेव्ह केले जातील."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"नवीन संपर्कांसाठी एक डीफॉल्ट खाते निवडा:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"नवीन संपर्क तयार करा"</string>
<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"संपर्क संपादित करा"</string>
@@ -204,7 +204,7 @@
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कमी पहा"</string>
<string name="recent_card_title" msgid="8982782042698001695">"अलीकडील"</string>
<string name="about_card_title" msgid="2920942314212825637">"विषयी"</string>
- <string name="toast_making_personal_copy" msgid="288549957278065542">"वैयक्तिक प्रत तयार करीत आहे..."</string>
+ <string name="toast_making_personal_copy" msgid="288549957278065542">"वैयक्तिक प्रत तयार करत आहे..."</string>
<string name="tomorrow" msgid="6241969467795308581">"उद्या"</string>
<string name="today" msgid="8041090779381781781">"आज"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"आज <xliff:g id="TIME_INTERVAL">%s</xliff:g> वाजता"</string>
@@ -234,7 +234,7 @@
<string name="editor_add_photo_content_description" msgid="4194479313465418120">"संपर्क फोटो जोडा"</string>
<string name="editor_contact_photo_content_description" msgid="8571975622926162369">"संपर्क फोटो"</string>
<string name="editor_failed_to_load" msgid="1623639078580475818">"संपादक उघडण्यात अयशस्वी."</string>
- <string name="editor_account_selector_title" msgid="4426337993307015833">"यावर जतन करीत आहे"</string>
+ <string name="editor_account_selector_title" msgid="4426337993307015833">"यावर जतन करत आहे"</string>
<string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"<xliff:g id="ACCOUNT">%s</xliff:g> वरील संपर्क माहिती संपादनयोग्य नाही"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"संपर्कांचा दुवा साधा"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"रद्द करा"</string>
@@ -304,7 +304,7 @@
<string name="description_video_call" msgid="7120921378651700947">"व्हिडिओ कॉल करा"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"वारंवार सपर्क साधलेले साफ करायचे?"</string>
<string name="clearFrequentsConfirmation" msgid="2270554975938265734">"आपण संपर्क आणि फोन अॅप्स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अॅप्सना सुरवातीपासून आपली पत्ता प्राधान्ये जाणून घेण्याची सक्ती कराल."</string>
- <string name="clearFrequentsProgress_title" msgid="5157001637482794212">"वारंवार सपर्क साधलेले साफ करीत आहे..."</string>
+ <string name="clearFrequentsProgress_title" msgid="5157001637482794212">"वारंवार सपर्क साधलेले साफ करत आहे..."</string>
<string name="status_available" msgid="5586870015822828392">"उपलब्ध"</string>
<string name="status_away" msgid="1838861100379804730">"दूर आहे"</string>
<string name="status_busy" msgid="9147992455450257136">"व्यस्त"</string>
@@ -317,14 +317,14 @@
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"वारंवार संपर्क केलेले"</string>
<string name="list_filter_phones" msgid="735313795643493365">"फोन नंबरसह सर्व संपर्क"</string>
<string name="list_filter_phones_work" msgid="1470173699551475015">"कार्य प्रोफाईल संपर्क"</string>
- <string name="view_updates_from_group" msgid="1782685984905600034">"अद्यतने पहा"</string>
+ <string name="view_updates_from_group" msgid="1782685984905600034">"अपडेट पहा"</string>
<string name="account_phone" msgid="7128032778471187553">"डिव्हाइस"</string>
<string name="account_sim" msgid="6519016427905087952">"सिम"</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"नाव"</string>
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"टोपणनाव"</string>
<string name="name_given" msgid="4280790853455320619">"नाव"</string>
<string name="name_family" msgid="7466985689626017037">"आडनाव"</string>
- <string name="name_prefix" msgid="59756378548779822">"नाव प्रत्यय"</string>
+ <string name="name_prefix" msgid="59756378548779822">"नाव उपसर्ग"</string>
<string name="name_middle" msgid="8467433655992690326">"मधले नाव"</string>
<string name="name_suffix" msgid="3855278445375651441">"नाव"</string>
<string name="name_phonetic" msgid="4259595234312430484">"ध्वन्यात्मक नाव"</string>
@@ -392,7 +392,7 @@
<string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"संकालन करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्याने संकालन करा मधून कोणत्याही गटबद्ध न केलेल्या संपर्कांना देखील हटवेल."</string>
<string name="savingDisplayGroups" msgid="2133152192716475939">"प्रदर्शन पर्याय जतन करत आहे…"</string>
<string name="listCustomView" msgid="1840624396582117590">"सानुकूलित दृश्य"</string>
- <string name="dialog_new_contact_account" msgid="4969619718062454756">"आयात केलेले संपर्क यावर जतन करा:"</string>
+ <string name="dialog_new_contact_account" msgid="4969619718062454756">"आयात केलेले संपर्क यावर सेव्ह करा:"</string>
<string name="import_from_sim" msgid="6912071635295799131">"सिम कार्ड"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"सिम <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -423,14 +423,14 @@
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"संपर्क निर्यात करणे समाप्त झाले, संपर्क सामायिक करण्यासाठी सूचनेवर क्लिक करा."</string>
<string name="touch_to_share_contacts" msgid="4882485525268469736">"संपर्क सामायिक करण्यासाठी टॅप करा."</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे रद्द केले."</string>
- <string name="exporting_contact_list_title" msgid="9072240631534457415">"संपर्क डेटा निर्यात करीत आहे"</string>
+ <string name="exporting_contact_list_title" msgid="9072240631534457415">"संपर्क डेटा निर्यात करत आहे"</string>
<string name="exporting_contact_list_message" msgid="3367949209642931952">"संपर्क डेटा निर्यात केला जात आहे."</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"डेटाबेस माहिती मिळवू शकलो नाही."</string>
<string name="composer_has_no_exportable_contact" msgid="5712531702823346549">"कोणतेही निर्यात करण्यायोग्य संपर्क नाहीत."</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"vCard रचनाकाराने योग्यरित्या प्रारंभ केला नाही."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"निर्यात करू शकलो नाही"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"संपर्क डेटा निर्यात केला नाही.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
- <string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> आयात करीत आहे"</string>
+ <string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> आयात करत आहे"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard डेटा वाचू शकलो नाही"</string>
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> आयात करणे समाप्त झाले"</string>
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"<xliff:g id="FILENAME">%s</xliff:g> आयात करणे रद्द झाले"</string>
@@ -440,10 +440,10 @@
<string name="contacts_export_will_start_message" msgid="8538705791417534431">"संपर्क लवकरच निर्यात केले जातील."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard निर्यात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"संपर्क"</string>
- <string name="caching_vcard_message" msgid="4926308675041506756">"स्थानिक तात्पुरत्या संचयनावर vCard(s) कॅश करीत आहे. वास्तविक आयात लवकरच प्रारंभ होईल."</string>
+ <string name="caching_vcard_message" msgid="4926308675041506756">"स्थानिक तात्पुरत्या संचयनावर vCard(s) कॅश करत आहे. वास्तविक आयात लवकरच प्रारंभ होईल."</string>
<string name="vcard_import_failed" msgid="5223531255894842406">"vCard आयात करू शकलो नाही."</string>
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC वर संपर्क प्राप्त केला"</string>
- <string name="caching_vcard_title" msgid="1226272312940516605">"कॅश करीत आहे"</string>
+ <string name="caching_vcard_title" msgid="1226272312940516605">"कॅश करत आहे"</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"आयात करत आहे <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="4407527157056120858">".vcf फाईलवर निर्यात करा"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"नुसार क्रमवारी लावा"</string>
@@ -470,7 +470,7 @@
<string name="menu_contacts_filter" msgid="2165153460860262501">"प्रदर्शित करण्यासाठी संपर्क"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"प्रदर्शित करण्यासाठी संपर्क"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"दृश्य सानुकूल करा"</string>
- <string name="menu_custom_filter_save" msgid="2679793632208086460">"जतन करा"</string>
+ <string name="menu_custom_filter_save" msgid="2679793632208086460">"सेव्ह करा"</string>
<string name="hint_findContacts" msgid="7128627979899070325">"संपर्क शोधा"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"आवडते"</string>
<string name="menu_import" msgid="6107961135813836467">"आयात करा"</string>
@@ -519,7 +519,7 @@
<string name="dismiss_sync_alert" msgid="8941131776605093596">"डिसमिस करा"</string>
<string name="account_sync_off" msgid="7646143254066243924">"स्वयं-संकालन बंद आहे. चालू करण्यासाठी टॅप करा."</string>
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"स्वयं-संकालन चालू करायचे?"</string>
- <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"फक्त संपर्कांमध्ये नाही, तर आपण सर्व अॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अद्यतनित ठेवले जातील."</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"फक्त संपर्कांमध्ये नाही, तर आपण सर्व अॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अपडेट ठेवले जातील."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"चालू करा"</string>
<string name="connection_error_message" msgid="7046408921529247089">"कोणतेही कनेक्शन नाही"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"सिम"</string>
@@ -527,6 +527,8 @@
<string name="importing_sim_finished_title" msgid="5196369441294050721">"सिम कार्ड आयात करणे समाप्त झाले"</string>
<string name="importing_sim_failed_title" msgid="39706901030537985">"आयात अयशस्वी झाले"</string>
<string name="importing_sim_failed_message" msgid="3345258302998021066">"सिम कार्ड वरून संपर्क आयात करणेे शक्य झाले नाही"</string>
- <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करीत आहे"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करत आहे"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचना"</string>
+ <string name="yes_button" msgid="1268479086848288060">"होय"</string>
+ <string name="no_button" msgid="5742815694687835125">"नाही"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index fa06426..2407346 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Tidak dapat mengimport kenalan daripada kad SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimport SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Pemberitahuan"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ya"</string>
+ <string name="no_button" msgid="5742815694687835125">"Tidak"</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index bf2c84d..8f95a31 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"ဆင်းမ်ကဒ်မှ အဆက်အသွယ်များကို တင်သွင်း၍မရပါ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ဆင်းမ်ကဒ်ကို တင်သွင်းနေသည်"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"အကြောင်းကြားချက်များ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yes"</string>
+ <string name="no_button" msgid="5742815694687835125">"No"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 961edd5..9db3f4e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kunne ikke importére kontakter fra SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerer fra SIM-kortet"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Varsler"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nei"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b7a9f91..f592142 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -491,7 +491,7 @@
<string name="about_open_source_licenses" msgid="6479990452352919641">"खुला स्रोतका इजाजतपत्रहरू"</string>
<string name="about_open_source_licenses_summary" msgid="57418386931763994">"खुला स्रोतको सफ्टवेयरका लागि इजाजतपत्रका विवरणहरू"</string>
<string name="about_privacy_policy" msgid="3705518622499152626">"गोपनीयता नीति"</string>
- <string name="about_terms_of_service" msgid="4642400812150296723">"सेवा सर्तहरू"</string>
+ <string name="about_terms_of_service" msgid="4642400812150296723">"सेवाका सर्तहरू"</string>
<string name="activity_title_licenses" msgid="5467767062737708066">"खुला स्रोतका इजाजतपत्रहरू"</string>
<string name="url_open_error_toast" msgid="452592089815420457">"url खोल्न सकिएन।"</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> जाँच गरियो"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM कार्डबाट सम्पर्कहरू आयात गर्न सकिएन"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM आयात गरिँदै"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"सूचनाहरू"</string>
+ <string name="yes_button" msgid="1268479086848288060">"हुन्छ"</string>
+ <string name="no_button" msgid="5742815694687835125">"हुँदैन"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6caa088..f95afc1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kan geen contacten importeren van de simkaart"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Sim importeren"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meldingen"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nee"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7fc42e7..9e90fc8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -93,8 +93,8 @@
<string name="deleteConfirmation" msgid="3512271779086656043">"ਕੀ ਇਸ ਸੰਪਰਕ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
<string name="deleteConfirmation_positive_button" msgid="7857888845028586365">"ਹਟਾਓ"</string>
<string name="invalidContactMessage" msgid="8215051456181842274">"ਸੰਪਰਕ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
- <string name="createContactShortcutSuccessful_NoName" msgid="8831303345367275472">"ਸੰਪਰਕ ਮੁੱਖ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
- <string name="createContactShortcutSuccessful" msgid="953651153238790069">"<xliff:g id="NAME">%s</xliff:g> ਮੁੱਖ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="createContactShortcutSuccessful_NoName" msgid="8831303345367275472">"ਸੰਪਰਕ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="createContactShortcutSuccessful" msgid="953651153238790069">"<xliff:g id="NAME">%s</xliff:g> ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ।"</string>
<string name="photoPickerNotFoundText" msgid="2052542573853433204">"ਡੀਵਾਈਸ \'ਤੇ ਕੋਈ ਤਸਵੀਰਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ।"</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"ਸੰਪਰਕ ਫ਼ੋਟੋ"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"ਵਿਸ਼ੇਸ਼=ਵਿਉਂਤਬੱਧ ਲੇਬਲ ਨਾਮ"</string>
@@ -372,9 +372,9 @@
<string name="chat_jabber" msgid="7561444230307829609">"Jabber ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
<string name="chat" msgid="9025361898797412245">"ਚੈਟ"</string>
<string name="description_minus_button" msgid="6908099247930477551">"ਮਿਟਾਓ"</string>
- <string name="expand_name_fields_description" msgid="6948274252874552543">"ਹੋਰ ਨਾਮ ਖੇਤਰ ਵਿਖਾਓ"</string>
+ <string name="expand_name_fields_description" msgid="6948274252874552543">"ਹੋਰ ਨਾਮ ਖੇਤਰ ਦਿਖਾਓ"</string>
<string name="collapse_name_fields_description" msgid="4757877385895561556">"ਨਾਮ ਖੇਤਰਾਂ ਨੂੰ ਸੁੰਗੇੜੋ"</string>
- <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"ਹੋਰ ਧੁਨੀਆਤਮਿਕ ਨਾਮ ਖੇਤਰ ਵਿਖਾਓ"</string>
+ <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"ਹੋਰ ਧੁਨੀਆਤਮਿਕ ਨਾਮ ਖੇਤਰ ਦਿਖਾਓ"</string>
<string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"ਫ਼ੋਨੈਟਿਕ ਨਾਮ ਖੇਤਰਾਂ ਨੂੰ ਸੁੰਗੇੜੋ"</string>
<string name="expand_fields_description" msgid="8129294181216760037">"ਵਿਸਤਾਰ ਕਰੋ"</string>
<string name="collapse_fields_description" msgid="1884143625854637874">"ਸੁੰਗੇੜੋ"</string>
@@ -423,15 +423,15 @@
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ, ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸੂਚਨਾ \'ਤੇ ਕਲਿੱਕ ਕਰੋ।"</string>
<string name="touch_to_share_contacts" msgid="4882485525268469736">"ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
- <string name="exporting_contact_list_title" msgid="9072240631534457415">"ਸੰਪਰਕ ਡੈਟਾ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="exporting_contact_list_message" msgid="3367949209642931952">"ਸੰਪਰਕ ਡੈਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
+ <string name="exporting_contact_list_title" msgid="9072240631534457415">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+ <string name="exporting_contact_list_message" msgid="3367949209642931952">"ਸੰਪਰਕ ਡਾਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"ਡੈਟਾਬੇਸ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"</string>
<string name="composer_has_no_exportable_contact" msgid="5712531702823346549">"ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"vCard ਕੰਪੋਜ਼ਰ ਸਹੀ ਢੰਗ ਨਾਲ ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ।"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"ਨਿਰਯਾਤ ਨਹੀਂ ਹੋ ਸਕਿਆ"</string>
- <string name="exporting_contact_failed_message" msgid="4938527850142003141">"ਸੰਪਰਕ ਡੈਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+ <string name="exporting_contact_failed_message" msgid="4938527850142003141">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> ਆਯਾਤ ਹੋ ਰਿਹਾ ਹੈ"</string>
- <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard ਡੈਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
+ <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard ਡਾਟਾ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"</string>
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਆਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਆਯਾਤ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
@@ -448,7 +448,7 @@
<string name="export_to_vcf_file" msgid="4407527157056120858">".vcf ਫ਼ਾਈਲ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
<string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"ਧੁਨੀਆਤਮਿਕ ਨਾਮ"</string>
- <string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"ਹਮੇਸ਼ਾ ਵਿਖਾਓ"</string>
+ <string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"ਹਮੇਸ਼ਾ ਦਿਖਾਓ"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"ਲੁਕਾਓ ਜੇਕਰ ਖਾਲੀ ਹੈ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ਨਾਮ ਦਾ ਪਹਿਲਾ ਭਾਗ"</string>
<string name="display_options_sort_by_family_name" msgid="2684905041926954793">"ਨਾਮ ਦਾ ਆਖਰੀ ਭਾਗ"</string>
@@ -506,7 +506,7 @@
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ਸੰਪਰਕ ਹਟਾਇਆ ਗਿਆ ਸੀ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ਆਯਾਤ ਕਰੋ"</string>
<string name="sim_import_title_none_selected" msgid="6910517331401970693">"ਸੰਪਰਕ ਚੁਣੋ"</string>
- <string name="sim_import_empty_message" msgid="7743815244380189651">"ਤੁਹਾਡੇ SIM ਕਾਰਡ \'ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
+ <string name="sim_import_empty_message" msgid="7743815244380189651">"ਤੁਹਾਡੇ ਸਿਮ ਕਾਰਡ \'ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"ਸੰਪਰਕ ਪਹਿਲਾਂ ਹੀ ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਮੌਜੂਦ ਹੈ"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> SIM ਸੰਪਰਕ ਆਯਾਤ ਕੀਤੇ ਗਏ</item>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM ਕਾਰਡ ਤੋਂ ਸੰਪਰਕ ਆਯਾਤ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ਸਿਮ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"ਸੂਚਨਾਵਾਂ"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ਹਾਂ"</string>
+ <string name="no_button" msgid="5742815694687835125">"ਨਹੀਂ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2c31633..061316b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -335,7 +335,7 @@
<string name="name_prefix" msgid="59756378548779822">"Przedrostek nazwiska"</string>
<string name="name_middle" msgid="8467433655992690326">"Drugie imię"</string>
<string name="name_suffix" msgid="3855278445375651441">"Przyrostek nazwiska"</string>
- <string name="name_phonetic" msgid="4259595234312430484">"Nazwa (fonetycznie)"</string>
+ <string name="name_phonetic" msgid="4259595234312430484">"Nazwisko (fonetycznie)"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"Imię (fonetycznie)"</string>
<string name="name_phonetic_middle" msgid="8643721493320405200">"Drugie imię (fonetycznie)"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"Nazwisko (fonetycznie)"</string>
@@ -353,7 +353,7 @@
<string name="label_notes" msgid="8337354953278341042">"Notatki"</string>
<string name="label_custom_field" msgid="1994056912242214426">"Niestandardowe"</string>
<string name="label_sip_address" msgid="7252153678613978127">"Adres SIP"</string>
- <string name="websiteLabelsGroup" msgid="4202998982804009261">"Adres witryny"</string>
+ <string name="websiteLabelsGroup" msgid="4202998982804009261">"Strona internetowa"</string>
<string name="groupsLabel" msgid="7000816729542098972">"Etykiety"</string>
<string name="email_home" msgid="8573740658148184279">"E-mail – domowy"</string>
<string name="email_mobile" msgid="2042889209787989814">"E-mail – komórka"</string>
@@ -459,7 +459,7 @@
<string name="progress_notifier_message" msgid="2311011466908220528">"Importowanie <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" msgid="4407527157056120858">"Eksportuj do pliku .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortuj według"</string>
- <string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nazwa (fonetycznie)"</string>
+ <string name="display_options_phonetic_name_fields" msgid="3771577099236534776">"Nazwisko (fonetycznie)"</string>
<string name="editor_options_always_show_phonetic_names" msgid="7253911385818398903">"Zawsze pokazuj"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2672008764795671104">"Ukryj, jeśli puste"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Imię"</string>
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nie udało się zaimportować kontaktów z karty SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuję kontakty z karty SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Powiadomienia"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Tak"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nie"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d0148d8..a9c1603 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+ <string name="no_button" msgid="5742815694687835125">"Não"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f60f241..047cc7c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar contactos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+ <string name="no_button" msgid="5742815694687835125">"Não"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d0148d8..a9c1603 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Não foi possível importar os contatos do cartão SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificações"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Sim"</string>
+ <string name="no_button" msgid="5742815694687835125">"Não"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 109b71f..5b49d0c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nu s-a putut importa agenda de pe cardul SIM."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se importă cardul SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Notificări"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nu"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 97e8d9b..7967569 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не удалось импортировать контакты с SIM-карты"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импорт контактов с SIM-карты…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Уведомления"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+ <string name="no_button" msgid="5742815694687835125">"Нет"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9b7e7a7..db0dd0f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"සම්බන්ධතා SIM කාඩ්පතෙන් ආයාත කිරීමට නොහැකි විය"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM ආයාත කරමින්"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"දැනුම් දීම්"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ඔව්"</string>
+ <string name="no_button" msgid="5742815694687835125">"නැත"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9f8d415..7e59774 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Nepodarilo sa importovať kontakty zo SIM karty"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuje sa SIM karta"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Upozornenia"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Áno"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nie"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index eea2486..b909a3a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Stikov s kartic SIM ni bilo mogoče uvoziti"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvažanje kartice SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Obvestila"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Da"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ne"</string>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 51f6988..e8bdde2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktet nga karta SIM nuk mund të importoheshin"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Karta SIM po importohet"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Njoftime"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Po"</string>
+ <string name="no_button" msgid="5742815694687835125">"Jo"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3f3f083..003547d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -536,4 +536,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Увоз контаката са SIM картице није успео"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Увози се са SIM-а"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Обавештења"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Да"</string>
+ <string name="no_button" msgid="5742815694687835125">"Не"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cb2d040..1345432 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Det gick inte att importera kontakter från SIM-kortet"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerar SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Meddelanden"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ja"</string>
+ <string name="no_button" msgid="5742815694687835125">"Nej"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51b62a9..c50b779 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -312,7 +312,7 @@
<string name="directory_search_label" msgid="1887759056597975053">"Saraka"</string>
<string name="directory_search_label_work" msgid="8618292129829443176">"Anwani za kazi"</string>
<string name="local_search_label" msgid="2551177578246113614">"Anwani zote"</string>
- <string name="description_quick_contact_for" msgid="6737516415168327789">"Mwasiliani wa haraka wa <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="description_quick_contact_for" msgid="6737516415168327789">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="missing_name" msgid="8745511583852904385">"(Hakuna jina)"</string>
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"Unaowasiliana nao zaidi"</string>
<string name="list_filter_phones" msgid="735313795643493365">"Anwani zote zilizo na nambari za simu"</string>
@@ -421,7 +421,7 @@
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>"</string>
<string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"Anwani zimehamishwa."</string>
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"Anwani zimehamishwa; bofya arifa ili ushiriki anwani."</string>
- <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gonga ili ushiriki anwani."</string>
+ <string name="touch_to_share_contacts" msgid="4882485525268469736">"Gusa ili ushiriki anwani."</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Inahamisha data ya anwani"</string>
<string name="exporting_contact_list_message" msgid="3367949209642931952">"Data ya anwani inahamishwa."</string>
@@ -515,9 +515,9 @@
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Imeshindwa kuleta anwani zilizo kwenye SIM kadi"</string>
<string name="sim_import_title" msgid="2511154832820812822">"Leta kutoka kwenye SIM kadi"</string>
<string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Ghairi"</string>
- <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gonga ili uuwashe."</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gusa ili uuwashe."</string>
<string name="dismiss_sync_alert" msgid="8941131776605093596">"Ondoa"</string>
- <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gonga ili uuwashe."</string>
+ <string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gusa ili uuwashe."</string>
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Je, unataka kuwasha usawazishaji wa kiotomatiki?"</string>
<string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Mabadiliko utakayofanya katika programu na akaunti zote, wala si katika Anwani tu, yatasawazishwa kwenye wavuti na kwenye vifaa vyako."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Washa"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Imeshindwa kuleta anwani kutoka kwenye SIM kadi"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Anwani zilizo kwenye SIM kadi zinaletwa"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Arifa"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ndiyo"</string>
+ <string name="no_button" msgid="5742815694687835125">"La"</string>
</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 7d9eb33..7a0fce5 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,7 +17,6 @@
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-land-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">72dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
<!-- Height for the image for empty group view-->
<dimen name="empty_view_image_height">180dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index a38364c..18b43d9 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -17,7 +17,6 @@
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-sw600dp-port-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">72dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">96dp</dimen>
<dimen name="editor_type_label_width">122dip</dimen>
<dimen name="shortcut_icon_size">64dip</dimen>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fe4817f..bc39fb6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -24,7 +24,7 @@
<string name="shortcutMessageContact" msgid="2460337253595976198">"நேரடி செய்தி"</string>
<string name="shortcutActivityTitle" msgid="1504383567778497348">"தொடர்பைத் தேர்வுசெய்க"</string>
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"தொடர்பில் சேர்"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"தொடர்பைத் தேர்வுசெய்யவும்"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"தொடர்பைத் தேர்வுசெய்க"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"தேர்ந்தெடுக்கவும்"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"புதிய தொடர்பை உருவாக்கவும்"</string>
<string name="searchHint" msgid="8482945356247760701">"தொடர்புகளைத் தேடு"</string>
@@ -312,7 +312,7 @@
<string name="directory_search_label" msgid="1887759056597975053">"கோப்பகம்"</string>
<string name="directory_search_label_work" msgid="8618292129829443176">"பணிக் கோப்பகம்"</string>
<string name="local_search_label" msgid="2551177578246113614">"எல்லா தொடர்புகளும்"</string>
- <string name="description_quick_contact_for" msgid="6737516415168327789">"<xliff:g id="NAME">%1$s</xliff:g> க்கான உடனடித் தொடர்பு"</string>
+ <string name="description_quick_contact_for" msgid="6737516415168327789">"<xliff:g id="NAME">%1$s</xliff:g> க்கான விரைவுத் தொடர்பு"</string>
<string name="missing_name" msgid="8745511583852904385">"(பெயர் இல்லை)"</string>
<string name="favoritesFrequentContacted" msgid="6184232487472425690">"அடிக்கடி தொடர்புகொண்டவர்கள்"</string>
<string name="list_filter_phones" msgid="735313795643493365">"மொபைல் எண்களுடனான எல்லா தொடர்புகளும்"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"சிம் கார்டிலிருந்து தொடர்புகளை இறக்க முடியவில்லை"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"சிம் கார்டை இறக்குகிறது"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"அறிவிப்புகள்"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ஆம்"</string>
+ <string name="no_button" msgid="5742815694687835125">"இல்லை"</string>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9d3efd6..02ee273 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -329,7 +329,7 @@
<string name="name_suffix" msgid="3855278445375651441">"పేరు అంత్యప్రత్యయం"</string>
<string name="name_phonetic" msgid="4259595234312430484">"ఫోనెటిక్ రూపంలో పేరు"</string>
<string name="name_phonetic_given" msgid="8723179018384187631">"ఫొనెటిక్ మొదటి పేరు"</string>
- <string name="name_phonetic_middle" msgid="8643721493320405200">"ఫోనెటిక్ మధ్య పేరు"</string>
+ <string name="name_phonetic_middle" msgid="8643721493320405200">"ఫొనెటిక్ మధ్య పేరు"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"ఫొనెటిక్ చివరి పేరు"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"ఫోన్"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"ఇమెయిల్"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM కార్డ్ నుండి పరిచయాలను దిగుమతి చేయలేకపోయింది"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIMను దిగుమతి చేస్తోంది"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"నోటిఫికేషన్లు"</string>
+ <string name="yes_button" msgid="1268479086848288060">"అవును"</string>
+ <string name="no_button" msgid="5742815694687835125">"కాదు"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 16671a3..515a919 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -301,7 +301,7 @@
<string name="sms_assistant" msgid="2773424339923116234">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="4069352461380762677">"ส่งข้อความถึง MMS"</string>
<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ข้อความ)"</string>
- <string name="description_video_call" msgid="7120921378651700947">"ใช้แฮงเอาท์วิดีโอ"</string>
+ <string name="description_video_call" msgid="7120921378651700947">"ใช้ Hangouts วิดีโอ"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"ล้างผู้ที่คุณติดต่อด้วยบ่อยๆ หรือไม่"</string>
<string name="clearFrequentsConfirmation" msgid="2270554975938265734">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contact และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"กำลังล้างผู้ที่คุณติดต่อด้วยบ่อยๆ…"</string>
@@ -496,7 +496,7 @@
<string name="url_open_error_toast" msgid="452592089815420457">"เปิด URL ไม่สำเร็จ"</string>
<string name="account_filter_view_checked" msgid="6696859503887762213">"เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g> แล้ว"</string>
<string name="account_filter_view_not_checked" msgid="2248684521205038389">"ไม่ได้เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
- <string name="description_search_video_call" msgid="5841525580339803272">"เริ่มแฮงเอาท์วิดีโอ"</string>
+ <string name="description_search_video_call" msgid="5841525580339803272">"เริ่ม Hangouts วิดีโอ"</string>
<string name="description_delete_contact" msgid="53835657343783663">"ลบ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"จุดไข่ปลา"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"นำเข้ารายชื่อติดต่อจากซิมการ์ดไม่ได้"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"กำลังนำเข้าจากซิมการ์ด"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"การแจ้งเตือน"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ใช่"</string>
+ <string name="no_button" msgid="5742815694687835125">"ไม่"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 294e7da..769360c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -101,7 +101,7 @@
<string name="removePhoto" msgid="4898105274130284565">"Alisin ang larawan"</string>
<string name="noContacts" msgid="2228592924476426108">"Walang laman ang iyong listahan ng mga contact"</string>
<string name="emptyGroup" msgid="5102411903247859575">"Walang mga contact na mayroong ganitong label"</string>
- <string name="emptyAccount" msgid="6873962901497975964">"Walang mga contact sa account na ito"</string>
+ <string name="emptyAccount" msgid="6873962901497975964">"Walang contact sa account na ito"</string>
<string name="emptyMainList" msgid="2772242747899664460">"Walang laman ang iyong listahan ng mga contact"</string>
<string name="contactSavedNamedToast" msgid="895136068894549611">"Na-save si <xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
<string name="contactSavedToast" msgid="9171862279493213075">"Na-save ang contact"</string>
@@ -200,7 +200,7 @@
<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="action_menu_add_new_contact_button" msgid="5506832825256203208">"Gumawa 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_more" msgid="3779194067124758079">"Tumingin pa"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Tumingin nang mas kaunti"</string>
<string name="recent_card_title" msgid="8982782042698001695">"Kamakailan"</string>
<string name="about_card_title" msgid="2920942314212825637">"Tungkol dito"</string>
@@ -229,7 +229,7 @@
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string>
<string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. mag-click upang tumawag"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
- <string name="editor_more_fields" msgid="3630987771304393421">"Higit pang mga field"</string>
+ <string name="editor_more_fields" msgid="3630987771304393421">"Higit pang field"</string>
<string name="editor_change_photo_content_description" msgid="820879708069864340">"Baguhin ang larawan ng contact"</string>
<string name="editor_add_photo_content_description" msgid="4194479313465418120">"Magdagdag ng larawan ng contact"</string>
<string name="editor_contact_photo_content_description" msgid="8571975622926162369">"Larawan ng contact"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Hindi ma-import ang mga contact mula sa SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ini-import ang SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Mga Notification"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Oo"</string>
+ <string name="no_button" msgid="5742815694687835125">"Hindi"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4b64456..d6a0ef7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -279,7 +279,7 @@
<string name="call_assistant" msgid="670941612175068337">"Telefon et: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_mms" msgid="6274041545876221437">"Çağrı yap (MMS)"</string>
<string name="call_by_shortcut" msgid="2566802538698913124">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefon et)"</string>
- <string name="sms_custom" msgid="415060214233647603">"Kısa mesaj gönder: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
+ <string name="sms_custom" msgid="415060214233647603">"SMS gönder: <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="7524332261493162995">"SMS gönder (ev)"</string>
<string name="sms_mobile" msgid="5200107250451030769">"SMS gönder (mobil)"</string>
<string name="sms_work" msgid="2269624156655267740">"SMS gönder (iş)"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM karttaki kişiler içe aktarılamadı"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM kişileri içe aktarılıyor"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirimler"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Evet"</string>
+ <string name="no_button" msgid="5742815694687835125">"Hayır"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e394ea3..35acee8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -198,7 +198,7 @@
<string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Нові контакти буде збережено в обліковому записі <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
<string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Виберіть обліковий запис за умовчанням для нових контактів:"</string>
<string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Створити новий контакт"</string>
- <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Змінити контакт"</string>
+ <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Редагувати контакт"</string>
<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Лише перегляд"</string>
<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Вибрати контакт для редагування"</string>
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Об’єднані контакти"</string>
@@ -543,4 +543,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Не вдалось імпортувати контакти із SIM-карти"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпорт SIM-карти"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Сповіщення"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Так"</string>
+ <string name="no_button" msgid="5742815694687835125">"Ні"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f3b5b41..b92c73c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"SIM کارڈ سے رابطے درآمد نہیں ہو سکے"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM درآمد ہو رہی ہے"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"اطلاعات"</string>
+ <string name="yes_button" msgid="1268479086848288060">"ہاں"</string>
+ <string name="no_button" msgid="5742815694687835125">"نہیں"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 29477bb..7b12ce2 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -122,7 +122,7 @@
<string name="groupExistsErrorMessage" msgid="5196811283836946189">"Bunday yorliq allaqachon mavjud"</string>
<string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Ayrim kontaktlarda e-pochta manz. ko‘rsatilmagan."</string>
<string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Ayrim kontaktlarda telefon raqami ko‘rsatilmagan."</string>
- <string name="menu_sendEmailOption" msgid="5978319931321657780">"E-pochta orqali xat yuborish"</string>
+ <string name="menu_sendEmailOption" msgid="5978319931321657780">"E-maktub yuborish"</string>
<string name="menu_sendMessageOption" msgid="8850168125274916426">"SMS yuborish"</string>
<string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Kontaktlarni tanlang"</string>
<string name="send_to_selection" msgid="2251339182881603540">"Yuborish"</string>
@@ -521,7 +521,7 @@
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Avto sinxronlash yoqilsinmi?"</string>
<string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Ilova va hisoblarga kiritgan o‘zgarishlar (nafaqat Google Kontaktlar), ularning veb-versiyalaridan qurilmalarga avtomatik sinxronlanadi."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Yoqish"</string>
- <string name="connection_error_message" msgid="7046408921529247089">"Aloqa yo‘q"</string>
+ <string name="connection_error_message" msgid="7046408921529247089">"Internetga ulanmagansiz"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM karta"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Yana"</string>
<string name="importing_sim_finished_title" msgid="5196369441294050721">"Kontaktlar SIM kartadan import qilindi"</string>
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Kontaktlarni SIM kartadan import qilib bo‘lmadi."</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Kontakt. SIM kartadan import qilinmoqda…"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Bildirishnomalar"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Ha"</string>
+ <string name="no_button" msgid="5742815694687835125">"Yo‘q"</string>
</resources>
diff --git a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml b/res/values-v26/dimens.xml
similarity index 67%
copy from res/mipmap-anydpi-v26/ic_contacts_launcher.xml
copy to res/values-v26/dimens.xml
index 784f6e3..b5737f2 100644
--- a/res/mipmap-anydpi-v26/ic_contacts_launcher.xml
+++ b/res/values-v26/dimens.xml
@@ -5,7 +5,7 @@
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
+ 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,
@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/ic_contacts_launcher_background"/>
- <foreground android:drawable="@mipmap/ic_contacts_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+<resources>
+ <!-- On Android O, shortcut icons will be 108dp unmasked.
+ See go/o-icons-eng for more details. -->
+ <dimen name="shortcut_icon_size">108dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b985cdb..9e32cf6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Không thể nhập liên hệ từ thẻ SIM"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Đang nhập SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Thông báo"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Có"</string>
+ <string name="no_button" msgid="5742815694687835125">"Không"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f6e7a3a..2da207c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"无法导入 SIM 卡中的联系人"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在导入 SIM 卡联系人"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+ <string name="yes_button" msgid="1268479086848288060">"是"</string>
+ <string name="no_button" msgid="5742815694687835125">"否"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 52a9f44..b8a86bb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+ <string name="yes_button" msgid="1268479086848288060">"是"</string>
+ <string name="no_button" msgid="5742815694687835125">"否"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b406ddf..a07c254 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"無法從 SIM 卡匯入聯絡人資料"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡資料"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"通知"</string>
+ <string name="yes_button" msgid="1268479086848288060">"是"</string>
+ <string name="no_button" msgid="5742815694687835125">"否"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 60fc113..be1e4bd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -529,4 +529,6 @@
<string name="importing_sim_failed_message" msgid="3345258302998021066">"Ayikwazanga ukungenisa oxhumana nabo kusukela ku-SIM card"</string>
<string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ingenisa i-SIM"</string>
<string name="contacts_default_notification_channel" msgid="4754058700611188581">"Izaziso"</string>
+ <string name="yes_button" msgid="1268479086848288060">"Yebo"</string>
+ <string name="no_button" msgid="5742815694687835125">"Cha"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1aa84c6..aeba877 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,8 +14,7 @@
limitations under the License.
-->
<resources>
- <!-- Adaptive icon background layer color -->
- <color name="ic_contacts_launcher_background">#2458CA</color>
+ <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
<!-- 87% black -->
<color name="quantum_black_text">#dd000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e9fe2ad..f92cf79 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,10 +14,11 @@
limitations under the License.
-->
<resources>
+ <!-- Size of clickable icons that are GAR-4 -->
+ <dimen name="default_clickable_icon_size">48dp</dimen>
<!-- Copied from java/com/google/android/assets/launchscreens/res/values-port-v21/dimens.xml -->
<!-- Values adjusted for nav bar size due to windowDrawsSystemBarBackgrounds -->
<dimen name="launchscreens_product_logo_bottom">64dp</dimen>
- <dimen name="launchscreens_google_logo_bottom">104dp</dimen>
<!-- Initial height of transparent space above QuickContacts -->
<dimen name="quickcontact_starting_empty_height">150dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ea9708..d461455 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1586,4 +1586,10 @@
<!-- Text shown when viewing channel settings for default Contacts notifications [CHAR LIMIT=50] -->
<string name="contacts_default_notification_channel">Notifications</string>
+ <!-- Text of Positive Button in dialog -->
+ <string name="yes_button">Yes</string>
+
+ <!-- Text of Negative Button in dialog -->
+ <string name="no_button">No</string>
+
</resources>
diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index c33893a..7ce90e6 100644
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -17,7 +17,7 @@
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:enabled="true"
- android:icon="@drawable/ic_add_circle_24dp"
+ android:icon="@drawable/ic_add_contact_shortcut"
android:shortcutId="shortcut-add-contact"
android:shortcutShortLabel="@string/shortcut_add_contact">
<intent
diff --git a/src/com/android/contacts/CallUtil.java b/src/com/android/contacts/CallUtil.java
index ddde01c..bba1faa 100644
--- a/src/com/android/contacts/CallUtil.java
+++ b/src/com/android/contacts/CallUtil.java
@@ -19,17 +19,23 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telecom.VideoProfile;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
+import android.util.Log;
import com.android.contacts.compat.CompatUtils;
import com.android.contacts.compat.PhoneAccountSdkCompat;
import com.android.contacts.util.PermissionsUtil;
import com.android.contacts.util.PhoneNumberHelper;
import com.android.contactsbind.FeedbackHelper;
+import com.android.contactsbind.experiments.Flags;
import com.android.phone.common.PhoneConstants;
import java.util.List;
@@ -60,6 +66,14 @@
*/
public static final int VIDEO_CALLING_PRESENCE = 2;
+ /** {@link PhoneAccount#EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK} */
+ private static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK =
+ "android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";
+
+ /** {@link CarrierConfigManager#CONFIG_ALLOW_VIDEO_CALLING_FALLBACK} */
+ private static final String CONFIG_ALLOW_VIDEO_CALLING_FALLBACK =
+ "allow_video_calling_fallback_bool";
+
/**
* Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined
* automatically.
@@ -80,7 +94,17 @@
* automatically.
*/
public static Intent getCallIntent(String number) {
- return getCallIntent(getCallUri(number));
+ Uri uri = getCallUri(number);
+ return PhoneNumberUtils.isEmergencyNumber(number)
+ ? getCallIntentForEmergencyNumber(uri) : getCallIntent(uri);
+ }
+
+ /**
+ * Return an Intent to directly start Dialer when calling an emergency number. Scheme is always
+ * PhoneAccount.SCHEME_TEL.
+ */
+ private static Intent getCallIntentForEmergencyNumber(Uri uri) {
+ return new Intent(Intent.ACTION_DIAL, uri);
}
/**
@@ -199,4 +223,66 @@
}
}
+
+ /**
+ * Determines if we're able to use Tachyon as a fallback for video calling.
+ *
+ * @param context The context.
+ * @return {@code true} if there exists a call capable phone account which supports using a
+ * fallback for video calling, the carrier configuration supports a fallback, and the
+ * experiment for using a fallback is enabled. Otherwise {@code false} is returned.
+ */
+ public static boolean isTachyonEnabled(Context context) {
+ // Need to be able to read phone state, and be on at least N to check PhoneAccount extras.
+ if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
+ || !CompatUtils.isNCompatible()) {
+ return false;
+ }
+ TelecomManager telecommMgr = (TelecomManager)
+ context.getSystemService(Context.TELECOM_SERVICE);
+ if (telecommMgr == null) {
+ return false;
+ }
+ try {
+ List<PhoneAccountHandle> accountHandles = telecommMgr.getCallCapablePhoneAccounts();
+ for (PhoneAccountHandle accountHandle : accountHandles) {
+ PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);
+ if (account == null) {
+ continue;
+ }
+ // Check availability for the device config.
+ final Bundle accountExtras = account.getExtras();
+ final boolean deviceEnabled = accountExtras != null && accountExtras.getBoolean(
+ EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK);
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Device video fallback config: " + deviceEnabled);
+ }
+
+ // Check availability from carrier config.
+ final PersistableBundle carrierConfig = context.getSystemService(
+ CarrierConfigManager.class).getConfig();
+ final boolean carrierEnabled =
+ carrierConfig != null && carrierConfig.getBoolean(
+ CONFIG_ALLOW_VIDEO_CALLING_FALLBACK);
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Carrier video fallback config: " + carrierEnabled);
+ }
+
+ // Check experiment value.
+ final boolean experimentEnabled = Flags.getInstance().getBoolean(
+ Experiments.QUICK_CONTACT_VIDEO_CALL);
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Experiment video fallback config: " + experimentEnabled);
+ }
+
+ // All three checks above must be true to enable Tachyon calling.
+ return deviceEnabled && carrierEnabled && experimentEnabled;
+ }
+ return false;
+ } catch (SecurityException e) {
+ FeedbackHelper.sendFeedback(context, TAG,
+ "Security exception when getting call capable phone accounts", e);
+ return false;
+ }
+ }
}
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index e287e4a..ac950d9 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -16,6 +16,7 @@
package com.android.contacts;
import android.annotation.TargetApi;
+import android.app.ActivityManager;
import android.app.job.JobInfo;
import android.app.job.JobParameters;
import android.app.job.JobScheduler;
@@ -51,6 +52,7 @@
import com.android.contacts.activities.RequestPermissionsActivity;
import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.lettertiles.LetterTileDrawable;
import com.android.contacts.util.BitmapUtil;
import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.util.PermissionsUtil;
@@ -95,21 +97,18 @@
private static final int SHORTCUT_TYPE_CONTACT_URI = 1;
private static final int SHORTCUT_TYPE_ACTION_URI = 2;
- // The spec specifies that it should be 44dp @ xxxhdpi
- // Note that ShortcutManager.getIconMaxWidth and ShortcutManager.getMaxHeight return different
- // (larger) values.
- private static final int RECOMMENDED_ICON_PIXEL_LENGTH = 176;
-
@VisibleForTesting
static final String[] PROJECTION = new String[] {
Contacts._ID, Contacts.LOOKUP_KEY, Contacts.DISPLAY_NAME_PRIMARY
};
private final Context mContext;
+
private final ContentResolver mContentResolver;
private final ShortcutManager mShortcutManager;
private int mShortLabelMaxLength = SHORT_LABEL_MAX_LENGTH;
private int mLongLabelMaxLength = LONG_LABEL_MAX_LENGTH;
+ private int mIconSize;
private final int mContentChangeMinUpdateDelay;
private final int mContentChangeMaxUpdateDelay;
private final JobScheduler mJobScheduler;
@@ -131,6 +130,12 @@
.getInteger(Experiments.DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
mContentChangeMaxUpdateDelay = Flags.getInstance()
.getInteger(Experiments.DYNAMIC_MAX_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
+ final ActivityManager am = (ActivityManager) context
+ .getSystemService(Context.ACTIVITY_SERVICE);
+ mIconSize = context.getResources().getDimensionPixelSize(R.dimen.shortcut_icon_size);
+ if (mIconSize == 0) {
+ mIconSize = am.getLauncherLargeIconSize();
+ }
}
@VisibleForTesting
@@ -292,6 +297,7 @@
final ShortcutInfo.Builder builder = new ShortcutInfo.Builder(mContext, id)
.setIntent(action)
.setIcon(icon)
+ .setExtras(extras)
.setDisabledMessage(mContext.getString(R.string.dynamic_shortcut_disabled_message));
setLabel(builder, label);
@@ -300,6 +306,9 @@
public ShortcutInfo getQuickContactShortcutInfo(long id, String lookupKey, String displayName) {
final ShortcutInfo.Builder builder = builderForContactShortcut(id, lookupKey, displayName);
+ if (builder == null) {
+ return null;
+ }
addIconForContact(id, lookupKey, displayName, builder);
return builder.build();
}
@@ -373,10 +382,8 @@
final int iconMaxHeight = mShortcutManager.getIconMaxHeight();
final int sampleSize = Math.min(
- BitmapUtil.findOptimalSampleSize(sourceWidth,
- RECOMMENDED_ICON_PIXEL_LENGTH),
- BitmapUtil.findOptimalSampleSize(sourceHeight,
- RECOMMENDED_ICON_PIXEL_LENGTH));
+ BitmapUtil.findOptimalSampleSize(sourceWidth, mIconSize),
+ BitmapUtil.findOptimalSampleSize(sourceHeight, mIconSize));
final BitmapFactory.Options opts = new BitmapFactory.Options();
opts.inSampleSize = sampleSize;
@@ -404,46 +411,26 @@
return BitmapUtil.getRoundedBitmap(bitmap, targetSize, targetSize);
}
- // If on O or higher, add padding around the bitmap.
- final int paddingW = (int) (bitmap.getWidth() *
- AdaptiveIconDrawable.getExtraInsetFraction());
- final int paddingH = (int) (bitmap.getHeight() *
- AdaptiveIconDrawable.getExtraInsetFraction());
-
- final Bitmap scaledBitmap = Bitmap.createBitmap(bitmap.getWidth() + paddingW,
- bitmap.getHeight() + paddingH, bitmap.getConfig());
-
- final Canvas scaledCanvas = new Canvas(scaledBitmap);
- scaledCanvas.drawBitmap(bitmap, paddingW / 2, paddingH / 2, null);
-
- return scaledBitmap;
+ return bitmap;
}
private Bitmap getFallbackAvatar(String displayName, String lookupKey) {
- final int width;
- final int height;
- final int padding;
- if (BuildCompat.isAtLeastO()) {
- // Add padding on >= O
- padding = (int) (RECOMMENDED_ICON_PIXEL_LENGTH *
- AdaptiveIconDrawable.getExtraInsetFraction());
- width = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
- height = RECOMMENDED_ICON_PIXEL_LENGTH + padding;
- } else {
- padding = 0;
- width = RECOMMENDED_ICON_PIXEL_LENGTH;
- height = RECOMMENDED_ICON_PIXEL_LENGTH;
- }
+ // Use a circular icon if we're not on O or higher.
+ final boolean circularIcon = !BuildCompat.isAtLeastO();
final ContactPhotoManager.DefaultImageRequest request =
- new ContactPhotoManager.DefaultImageRequest(displayName, lookupKey, true);
+ new ContactPhotoManager.DefaultImageRequest(displayName, lookupKey, circularIcon);
+ if (BuildCompat.isAtLeastO()) {
+ // On O, scale the image down to add the padding needed by AdaptiveIcons.
+ request.scale = LetterTileDrawable.getAdaptiveIconScale();
+ }
final Drawable avatar = ContactPhotoManager.getDefaultAvatarDrawableForContact(
mContext.getResources(), true, request);
- final Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ final Bitmap result = Bitmap.createBitmap(mIconSize, mIconSize, Bitmap.Config.ARGB_8888);
// The avatar won't draw unless it thinks it is visible
avatar.setVisible(true, true);
final Canvas canvas = new Canvas(result);
- avatar.setBounds(padding, padding, width - padding, height - padding);
+ avatar.setBounds(0, 0, mIconSize, mIconSize);
avatar.draw(canvas);
return result;
}
diff --git a/src/com/android/contacts/Experiments.java b/src/com/android/contacts/Experiments.java
index b53ced3..b66311d 100644
--- a/src/com/android/contacts/Experiments.java
+++ b/src/com/android/contacts/Experiments.java
@@ -39,6 +39,12 @@
"Shortcuts__dynamic_min_content_change_update_delay_millis";
/**
+ * Flags for enabling video call from quick contact.
+ */
+ public static final String QUICK_CONTACT_VIDEO_CALL =
+ "QuickContact__video_call_integration";
+
+ /**
* Flags for maximum time to show spinner for a contacts sync.
*/
public static final String PULL_TO_REFRESH_CANCEL_REFRESH_MILLIS =
diff --git a/src/com/android/contacts/ShortcutIntentBuilder.java b/src/com/android/contacts/ShortcutIntentBuilder.java
index 3a0b36b..b3bd85d 100644
--- a/src/com/android/contacts/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/ShortcutIntentBuilder.java
@@ -40,6 +40,7 @@
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
+import android.support.v4.graphics.drawable.IconCompat;
import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
import android.support.v4.os.BuildCompat;
@@ -49,6 +50,7 @@
import android.text.TextUtils.TruncateAt;
import com.android.contacts.ContactPhotoManager.DefaultImageRequest;
+import com.android.contacts.lettertiles.LetterTileDrawable;
import com.android.contacts.util.BitmapUtil;
import com.android.contacts.util.ImplicitIntentsUtil;
@@ -260,14 +262,23 @@
Bitmap bitmap = BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length, null);
return new BitmapDrawable(mContext.getResources(), bitmap);
} else {
+ final DefaultImageRequest request = new DefaultImageRequest(displayName, lookupKey,
+ false);
+ if (BuildCompat.isAtLeastO()) {
+ // On O, scale the image down to add the padding needed by AdaptiveIcons.
+ request.scale = LetterTileDrawable.getAdaptiveIconScale();
+ }
return ContactPhotoManager.getDefaultAvatarDrawableForContact(mContext.getResources(),
- false, new DefaultImageRequest(displayName, lookupKey, false));
+ false, request);
}
}
private void createContactShortcutIntent(Uri contactUri, String contentType, String displayName,
String lookupKey, byte[] bitmapData) {
Intent intent = null;
+ if (TextUtils.isEmpty(displayName)) {
+ displayName = mContext.getResources().getString(R.string.missing_name);
+ }
if (BuildCompat.isAtLeastO()) {
final long contactId = ContentUris.parseId(contactUri);
final ShortcutManager sm = (ShortcutManager)
@@ -275,21 +286,24 @@
final DynamicShortcuts dynamicShortcuts = new DynamicShortcuts(mContext);
final ShortcutInfo shortcutInfo = dynamicShortcuts.getQuickContactShortcutInfo(
contactId, lookupKey, displayName);
- intent = sm.createShortcutResultIntent(shortcutInfo);
+ if (shortcutInfo != null) {
+ intent = sm.createShortcutResultIntent(shortcutInfo);
+ }
}
final Drawable drawable = getPhotoDrawable(bitmapData, displayName, lookupKey);
- if (TextUtils.isEmpty(displayName)) {
- displayName = mContext.getResources().getString(R.string.missing_name);
- }
final Intent shortcutIntent = ImplicitIntentsUtil.getIntentForQuickContactLauncherShortcut(
mContext, contactUri);
- final Bitmap icon = generateQuickContactIcon(drawable);
-
-
intent = intent == null ? new Intent() : intent;
- intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+
+ final Bitmap icon = generateQuickContactIcon(drawable);
+ if (BuildCompat.isAtLeastO()) {
+ final IconCompat compatIcon = IconCompat.createWithAdaptiveBitmap(icon);
+ compatIcon.addToShortcutIntent(intent);
+ } else {
+ intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ }
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, displayName);
@@ -325,18 +339,27 @@
shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Intent intent = null;
+ IconCompat compatAdaptiveIcon = null;
if (BuildCompat.isAtLeastO()) {
+ compatAdaptiveIcon = IconCompat.createWithAdaptiveBitmap(icon);
final ShortcutManager sm = (ShortcutManager)
mContext.getSystemService(Context.SHORTCUT_SERVICE);
final String id = shortcutAction + lookupKey;
final DynamicShortcuts dynamicShortcuts = new DynamicShortcuts(mContext);
final ShortcutInfo shortcutInfo = dynamicShortcuts.getActionShortcutInfo(
- id, displayName, shortcutIntent, Icon.createWithAdaptiveBitmap(icon));
- intent = sm.createShortcutResultIntent(shortcutInfo);
+ id, displayName, shortcutIntent, compatAdaptiveIcon.toIcon());
+ if (shortcutInfo != null) {
+ intent = sm.createShortcutResultIntent(shortcutInfo);
+ }
}
intent = intent == null ? new Intent() : intent;
- intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ // This will be non-null in O and above.
+ if (compatAdaptiveIcon != null) {
+ compatAdaptiveIcon.addToShortcutIntent(intent);
+ } else {
+ intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
+ }
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, shortcutName);
@@ -344,7 +367,6 @@
}
private Bitmap generateQuickContactIcon(Drawable photo) {
-
// Setup the drawing classes
Bitmap bitmap = Bitmap.createBitmap(mIconSize, mIconSize, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
@@ -354,6 +376,11 @@
photo.setBounds(dst);
photo.draw(canvas);
+ // Don't put a rounded border on an icon for O
+ if (BuildCompat.isAtLeastO()) {
+ return bitmap;
+ }
+
// Draw the icon with a rounded border
RoundedBitmapDrawable roundedDrawable =
RoundedBitmapDrawableFactory.create(mResources, bitmap);
@@ -421,22 +448,24 @@
// Draw the phone action icon as an overlay
int iconWidth = icon.getWidth();
- dst.set(iconWidth - ((int) (20 * density)), -1,
- iconWidth, ((int) (19 * density)));
- canvas.drawBitmap(phoneIcon, null, dst, photoPaint);
-
- canvas.setBitmap(null);
- if (!BuildCompat.isAtLeastO()) {
- return icon;
+ if (BuildCompat.isAtLeastO()) {
+ // On O we need to calculate where the phone icon goes slightly differently. The whole
+ // canvas area is 108dp, a centered circle with a diameter of 66dp is the "safe zone".
+ // So we start the drawing the phone icon at
+ // 108dp - 21 dp (distance from right edge of safe zone to the edge of the canvas)
+ // - 24 dp (size of the phone icon) on the x axis (left)
+ // The y axis is simply 21dp for the distance to the safe zone (top).
+ // See go/o-icons-eng for more details and a handy picture.
+ final int left = (int) (mIconSize - (45 * density));
+ final int top = (int) (21 * density);
+ canvas.drawBitmap(phoneIcon, left, top, photoPaint);
+ } else {
+ dst.set(iconWidth - ((int) (20 * density)), -1,
+ iconWidth, ((int) (19 * density)));
+ canvas.drawBitmap(phoneIcon, null, dst, photoPaint);
}
- // On >= O scale image up by AdaptiveIconDrawable.DEFAULT_VIEW_PORT_SCALE.
- final int scale = (int) (icon.getHeight() *
- (1f / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction())));
- final Bitmap scaledBitmap = Bitmap.createBitmap(icon.getWidth() + scale,
- icon.getHeight() + scale, icon.getConfig());
- Canvas scaledCanvas = new Canvas(scaledBitmap);
- scaledCanvas.drawBitmap(icon, scale / 2, scale / 2, null);
- return scaledBitmap;
+ canvas.setBitmap(null);
+ return icon;
}
}
diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index 82eed24..de04af9 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -78,21 +78,6 @@
/**
* @param context The context the dialog is to run in.
* @param callBack How the parent is notified that the date is set.
- * @param year The initial year of the dialog
- * @param monthOfYear The initial month of the dialog.
- * @param dayOfMonth The initial day of the dialog.
- */
- public DatePickerDialog(Context context,
- OnDateSetListener callBack,
- int year,
- int monthOfYear,
- int dayOfMonth) {
- this(context, callBack, year, monthOfYear, dayOfMonth, false);
- }
-
- /**
- * @param context The context the dialog is to run in.
- * @param callBack How the parent is notified that the date is set.
* @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no year
* has been specified
* @param monthOfYear The initial month of the dialog.
@@ -106,7 +91,7 @@
int dayOfMonth,
boolean yearOptional) {
// Don't pass a theme id. Instead use the default alert dialog theme.
- this(context, /* themeId = */ -1, callBack, year, monthOfYear, dayOfMonth,
+ this(context, /* themeId = */ 0, callBack, year, monthOfYear, dayOfMonth,
yearOptional);
}
@@ -114,24 +99,6 @@
* @param context The context the dialog is to run in.
* @param theme the theme to apply to this dialog
* @param callBack How the parent is notified that the date is set.
- * @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no year
- * has been specified
- * @param monthOfYear The initial month of the dialog.
- * @param dayOfMonth The initial day of the dialog.
- */
- public DatePickerDialog(Context context,
- int theme,
- OnDateSetListener callBack,
- int year,
- int monthOfYear,
- int dayOfMonth) {
- this(context, theme, callBack, year, monthOfYear, dayOfMonth, false);
- }
-
- /**
- * @param context The context the dialog is to run in.
- * @param theme the theme to apply to this dialog
- * @param callBack How the parent is notified that the date is set.
* @param year The initial year of the dialog or {@link DatePickerDialog#NO_YEAR} if no
* year has been specified.
* @param monthOfYear The initial month of the dialog.
@@ -183,13 +150,6 @@
updateTitle(year, month, day);
}
- public void updateDate(int year, int monthOfYear, int dayOfMonth) {
- mInitialYear = year;
- mInitialMonth = monthOfYear;
- mInitialDay = dayOfMonth;
- mDatePicker.updateDate(year, monthOfYear, dayOfMonth);
- }
-
private void updateTitle(int year, int month, int day) {
final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.YEAR, year);
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 963c125..ef5df1b 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -33,6 +33,7 @@
import com.android.contacts.model.account.AccountDisplayInfo;
import com.android.contacts.model.account.AccountDisplayInfoFactory;
import com.android.contacts.util.SharedPreferenceUtil;
+import com.android.contactsbind.HelpUtils;
import com.android.contactsbind.ObjectFactory;
import java.util.ArrayList;
@@ -118,8 +119,10 @@
mMiscItems.add(new DividerItem());
mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,
R.drawable.quantum_ic_settings_vd_theme_24));
- mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
- R.drawable.quantum_ic_help_vd_theme_24));
+ if (HelpUtils.isHelpAndFeedbackAvailable()) {
+ mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
+ R.drawable.quantum_ic_help_vd_theme_24));
+ }
rebuildItemsList();
}
diff --git a/src/com/android/contacts/drawer/DrawerFragment.java b/src/com/android/contacts/drawer/DrawerFragment.java
index 0aaa262..854f0e6 100644
--- a/src/com/android/contacts/drawer/DrawerFragment.java
+++ b/src/com/android/contacts/drawer/DrawerFragment.java
@@ -123,6 +123,12 @@
return;
}
mGroupListItems.clear();
+ // Initialize cursor's position. If Activity relaunched by orientation change,
+ // only onLoadFinished is called. OnCreateLoader is not called.
+ // The cursor's position is remain end position by moveToNext when the last
+ // onLoadFinished was called.
+ // Therefore, if cursor position was not initialized mGroupListItems is empty.
+ data.moveToPosition(-1);
for (int i = 0; i < data.getCount(); i++) {
if (data.moveToNext()) {
mGroupListItems.add(GroupUtil.getGroupListItem(data, i));
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 5463322..2abd509 100755
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -52,6 +52,7 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
+import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListPopupWindow;
import android.widget.Toast;
@@ -100,6 +101,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
/**
@@ -747,6 +749,9 @@
});
}
+ final MenuItem helpMenu = menu.findItem(R.id.menu_help);
+ helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());
+
int size = menu.size();
for (int i = 0; i < size; i++) {
menu.getItem(i).setEnabled(mEnabled);
@@ -1279,6 +1284,13 @@
if (uri != null) {
editorView.setFullSizePhoto(uri);
}
+ final StructuredNameEditorView nameEditor = editorView.getNameEditorView();
+ final TextFieldsEditorView phoneticNameEditor = editorView.getPhoneticEditorView();
+ final boolean useJapaneseOrder =
+ Locale.JAPANESE.getLanguage().equals(Locale.getDefault().getLanguage());
+ if (useJapaneseOrder && nameEditor != null && phoneticNameEditor != null) {
+ nameEditor.setPhoneticView(phoneticNameEditor);
+ }
// The editor is ready now so make it visible
editorView.setEnabled(mEnabled);
diff --git a/src/com/android/contacts/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
index 711fbc0..c02816a 100644
--- a/src/com/android/contacts/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -81,6 +81,16 @@
public void onFieldChanged(String column, String value);
/**
+ * Update the phonetic field with the specified character string.
+ */
+ public void updatePhonetic(String column, String value);
+
+ /**
+ * Returns the phonetic field string of the specified column.
+ */
+ public String getPhonetic(String column);
+
+ /**
* Marks the underlying ValuesDelta as deleted, but does not update the view.
*/
public void markDeleted();
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 94f8a32..5d49064 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -254,6 +254,19 @@
return (StructuredNameEditorView) mEditors.getChildAt(0);
}
+ public TextFieldsEditorView getPhoneticEditorView() {
+ if (!StructuredName.CONTENT_ITEM_TYPE.equals(mKindSectionData.getMimeType())) {
+ return null;
+ }
+ for (int i = 0; i < mEditors.getChildCount(); i++) {
+ final View view = mEditors.getChildAt(i);
+ if (!(view instanceof StructuredNameEditorView)) {
+ return (TextFieldsEditorView) view;
+ }
+ }
+ return null;
+ }
+
/**
* Binds views for the given {@link KindSectionData}.
*
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 5712f39..df4c5f9 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -331,6 +331,17 @@
notifyEditorListener();
}
+ /** {@inheritDoc} */
+ @Override
+ public void updatePhonetic(String column, String value) {
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getPhonetic(String column){
+ return "";
+ }
+
protected void saveValue(String column, String value) {
mEntry.put(column, value);
}
diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index e43d02b..772bc16 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -179,7 +179,8 @@
if (uri == null) {
throw new IllegalArgumentException("Uri must not be null");
}
- if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString())) {
+ if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString()) &&
+ !uri.toString().equals(Profile.CONTENT_URI.toString())) {
throw new IllegalArgumentException("Invalid contact Uri: " + uri);
}
return uri;
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 7c61f64..19da5bc 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -387,6 +387,13 @@
? null : nameKindSectionView.getNameEditorView();
}
+ public TextFieldsEditorView getPhoneticEditorView() {
+ final KindSectionView kindSectionView = mKindSectionViewMap
+ .get(StructuredName.CONTENT_ITEM_TYPE);
+ return kindSectionView == null
+ ? null : kindSectionView.getPhoneticEditorView();
+ }
+
public RawContactDelta getCurrentRawContactDelta() {
return mCurrentRawContactDelta;
}
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 1387bd1..922ceec 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -21,8 +21,12 @@
import android.content.res.Resources;
import android.os.Parcel;
import android.os.Parcelable;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.text.Editable;
import android.util.AttributeSet;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
import com.android.contacts.R;
import com.android.contacts.model.RawContactDelta;
@@ -40,6 +44,8 @@
private StructuredNameDataItem mSnapshot;
private boolean mChanged;
+ private TextFieldsEditorView mPhoneticView;
+
public StructuredNameEditorView(Context context) {
super(context);
}
@@ -93,6 +99,53 @@
notifyEditorListener();
}
+ public void updatePhonetic(String column, String value) {
+ EditText view = null;
+
+ if (mPhoneticView != null) {
+ ViewGroup fields = (ViewGroup) mPhoneticView.findViewById(R.id.editors);
+
+ if (StructuredName.FAMILY_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(0);
+ } else if (StructuredName.GIVEN_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(2);
+ } else if (StructuredName.MIDDLE_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(1);
+ }
+
+ if (view != null) {
+ view.setText(value);
+ }
+ }
+ }
+
+ @Override
+ public String getPhonetic(String column) {
+ String input = "";
+ EditText view = null;
+
+ if (mPhoneticView != null) {
+ ViewGroup fields = (ViewGroup) mPhoneticView.findViewById(R.id.editors);
+
+ if (StructuredName.FAMILY_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(0);
+ } else if (StructuredName.GIVEN_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(2);
+ } else if (StructuredName.MIDDLE_NAME.equals(column)) {
+ view = (EditText) fields.getChildAt(1);
+ }
+
+ if (view != null) {
+ input = view.getText().toString();
+ }
+ }
+ return input;
+ }
+
+ public void setPhoneticView(TextFieldsEditorView phoneticNameEditor) {
+ mPhoneticView = phoneticNameEditor;
+ }
+
/**
* Returns the display name currently displayed in the editor.
*/
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index c3a240a..28fe87f 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -22,9 +22,11 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.text.Editable;
import android.text.InputType;
import android.text.Spannable;
+import android.text.Spanned;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.style.TtsSpan;
@@ -69,6 +71,10 @@
private int mMinFieldHeight;
private int mPreviousViewHeight;
private int mHintTextColorUnfocused;
+ private String mFixedPhonetic = "";
+ private String mFixedDisplayName = "";
+ private boolean needInputInitialize;
+
public TextFieldsEditorView(Context context) {
super(context);
@@ -174,6 +180,10 @@
}
// Rebuild the label spinner using the new colors.
rebuildLabel();
+
+ if (hasFocus) {
+ needInputInitialize = true;
+ }
}
};
@@ -214,6 +224,38 @@
mFieldEditTexts[field].setText(value);
}
+ private boolean isUnFixed(Editable input) {
+ boolean unfixed = false;
+ Object[] spanned = input.getSpans(0, input.length(), Object.class);
+ if (spanned != null) {
+ for (Object obj : spanned) {
+ if ((input.getSpanFlags(obj) & Spanned.SPAN_COMPOSING) == Spanned.SPAN_COMPOSING) {
+ unfixed = true;
+ }
+ }
+ }
+ return unfixed;
+ }
+
+ private String getNameField(String column) {
+
+ EditText editText = null;
+
+ if (StructuredName.FAMILY_NAME.equals(column)) {
+ editText = (EditText) mFields.getChildAt(1);
+ } else if (StructuredName.GIVEN_NAME.equals(column)) {
+ editText = (EditText) mFields.getChildAt(3);
+ } else if (StructuredName.MIDDLE_NAME.equals(column)) {
+ editText = (EditText) mFields.getChildAt(2);
+ }
+
+ if (editText != null) {
+ return editText.getText().toString();
+ }
+
+ return "";
+ }
+
@Override
public void setValues(DataKind kind, ValuesDelta entry, RawContactDelta state, boolean readOnly,
ViewIdGenerator vig) {
@@ -280,18 +322,45 @@
// Prepare listener for writing changes
fieldView.addTextChangedListener(new TextWatcher() {
+ private int mStart = 0;
@Override
public void afterTextChanged(Editable s) {
// Trigger event for newly changed value
onFieldChanged(column, s.toString());
+
+ if (!DataKind.PSEUDO_MIME_TYPE_NAME.equals(getKind().mimeType)){
+ return;
+ }
+
+ String displayNameField = s.toString();
+
+ int nonFixedLen = displayNameField.length() - mFixedDisplayName.length();
+ if (isUnFixed(s) || nonFixedLen == 0) {
+ String tmpString = mFixedPhonetic
+ + displayNameField.substring(mStart, displayNameField.length());
+
+ updatePhonetic(column, tmpString);
+ } else {
+ mFixedPhonetic = getPhonetic(column);
+ mFixedDisplayName = displayNameField;
+ }
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ if (!DataKind.PSEUDO_MIME_TYPE_NAME.equals(getKind().mimeType)){
+ return;
+ }
+ if (needInputInitialize) {
+ mFixedPhonetic = getPhonetic(column);
+ mFixedDisplayName = getNameField(column);
+ needInputInitialize = false;
+ }
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
+ mStart = start;
if (!ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE.equals(
getKind().mimeType) || !(s instanceof Spannable)) {
return;
diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 0d2410d..9ed69ff 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -90,7 +90,7 @@
private static final String ARG_GROUP_URI = "groupUri";
- private static final int LOADER_GROUP_METADATA = 0;
+ private static final int LOADER_GROUP_METADATA = 100;
private static final int MSG_FAIL_TO_LOAD = 1;
private static final int RESULT_GROUP_ADD_MEMBER = 100;
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index 80d184b..853b8fc 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -233,7 +233,12 @@
dismiss();
return;
}
- final String name = getGroupName();
+ String name = getGroupName();
+ // Trim group name, when group is saved.
+ // When "Group" exists, do not save " Group ". This behavior is the same as Google Contacts.
+ if (!TextUtils.isEmpty(name)) {
+ name = name.trim();
+ }
// Note we don't check if the loader finished populating mExistingGroups. It's not the
// end of the world if the user ends up with a duplicate group and in practice it should
// never really happen (the query should complete much sooner than the user can edit the
@@ -283,8 +288,19 @@
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
mExistingGroups = new HashSet<>();
final GroupUtil.GroupsProjection projection = new GroupUtil.GroupsProjection(data);
+ // Initialize cursor's position. If Activity relaunched by orientation change,
+ // only onLoadFinished is called. OnCreateLoader is not called.
+ // The cursor's position is remain end position by moveToNext when the last onLoadFinished
+ // was called. Therefore, if cursor position was not initialized mExistingGroups is empty.
+ data.moveToPosition(-1);
while (data.moveToNext()) {
- final String title = projection.getTitle(data);
+ String title = projection.getTitle(data);
+ // Trim existing group name.
+ // When " Group " exists, do not save "Group".
+ // This behavior is the same as Google Contacts.
+ if (!TextUtils.isEmpty(title)) {
+ title = title.trim();
+ }
// Empty system groups aren't shown in the nav drawer so it would be confusing to tell
// the user that they already exist. Instead we allow them to create a duplicate
// group in this case. This is how the web handles this case as well (it creates a
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 367ae2f..5d27086 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -26,6 +26,8 @@
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
+import android.support.v4.text.BidiFormatter;
+import android.support.v4.text.TextDirectionHeuristicsCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -69,6 +71,8 @@
private Future<List<AccountInfo>> mAccountsFuture;
+ private static BidiFormatter sBidiFormatter = BidiFormatter.getInstance();
+
/** Preferred way to show this dialog */
public static void show(FragmentManager fragmentManager) {
final ImportDialogFragment fragment = new ImportDialogFragment();
@@ -160,7 +164,9 @@
phone = sim.getPhone();
}
if (phone != null) {
- phone = PhoneNumberUtilsCompat.createTtsSpannable(phone);
+ phone = sBidiFormatter.unicodeWrap(
+ PhoneNumberUtilsCompat.createTtsSpannable(phone),
+ TextDirectionHeuristicsCompat.LTR);
}
if (count != -1 && phone != null) {
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
index 5652ac6..b80fd4f 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -26,6 +26,7 @@
import android.graphics.Paint.Align;
import android.graphics.Rect;
import android.graphics.Typeface;
+import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
@@ -284,4 +285,11 @@
mIsCircle = isCircle;
return this;
}
+
+ /**
+ * Returns the scale percentage as a float for LetterTileDrawables used in AdaptiveIcons.
+ */
+ public static float getAdaptiveIconScale() {
+ return 1 / (1 + (2 * AdaptiveIconDrawable.getExtraInsetFraction()));
+ }
}
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 4f42a0f..385aa7c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -588,7 +588,8 @@
// Calculate height including padding.
int height = (mNameTextViewHeight + mPhoneticNameTextViewHeight +
mLabelAndDataViewMaxHeight +
- mSnippetTextViewHeight + mStatusTextViewHeight);
+ mSnippetTextViewHeight + mStatusTextViewHeight
+ + getPaddingBottom() + getPaddingTop());
// Make sure the height is at least as high as the photo
height = Math.max(height, mPhotoViewHeight + getPaddingBottom() + getPaddingTop());
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 92087b3..9b0c896 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -171,7 +171,8 @@
if (account.dataSet != null) {
groupsUri.appendQueryParameter(Groups.DATA_SET, account.dataSet).build();
}
- final Cursor cursor = resolver.query(groupsUri.build(), null, null, null, null);
+ final Cursor cursor = resolver.query(groupsUri.build(), null,
+ Groups.DELETED + "=0", null, null);
if (cursor == null) {
continue;
}
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index b442e4f..9938695 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -622,9 +622,10 @@
final AccountWithDataSet accountWithDataSet = new AccountWithDataSet(
account.name, account.type, null);
final AccountType type = mTypeProvider.getTypeForAccount(accountWithDataSet);
-
- // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
- result.add(type.wrapAccount(mContext, accountWithDataSet));
+ if (type != null) {
+ // Accounts with a dataSet (e.g. Google plus accounts) are not writable.
+ result.add(type.wrapAccount(mContext, accountWithDataSet));
+ }
}
return result;
}
diff --git a/src/com/android/contacts/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java
index bddfc09..c3e0eb5 100644
--- a/src/com/android/contacts/model/account/AccountType.java
+++ b/src/com/android/contacts/model/account/AccountType.java
@@ -444,6 +444,7 @@
public boolean optional;
public boolean shortForm;
public boolean longForm;
+ public String phoneticsColumn;
public EditField(String column, int titleRes) {
this.column = column;
@@ -470,6 +471,11 @@
return this;
}
+ public EditField setPhoneticsColumn(String phoneticsColumn) {
+ this.phoneticsColumn = phoneticsColumn;
+ return this;
+ }
+
public EditField setMinLines(int minLines) {
this.minLines = minLines;
return this;
diff --git a/src/com/android/contacts/model/account/BaseAccountType.java b/src/com/android/contacts/model/account/BaseAccountType.java
index 50f623a..b242950 100644
--- a/src/com/android/contacts/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/model/account/BaseAccountType.java
@@ -191,18 +191,18 @@
FLAGS_PERSON_NAME).setOptional(true));
if (!displayOrderPrimary) {
kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
- FLAGS_PERSON_NAME));
+ FLAGS_PERSON_NAME).setPhoneticsColumn(StructuredName.PHONETIC_FAMILY_NAME));
kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,
- FLAGS_PERSON_NAME).setOptional(true));
+ FLAGS_PERSON_NAME).setOptional(true).setPhoneticsColumn(StructuredName.PHONETIC_MIDDLE_NAME));
kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,
- FLAGS_PERSON_NAME));
+ FLAGS_PERSON_NAME).setPhoneticsColumn(StructuredName.PHONETIC_GIVEN_NAME));
} else {
kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,
- FLAGS_PERSON_NAME));
+ FLAGS_PERSON_NAME).setPhoneticsColumn(StructuredName.PHONETIC_GIVEN_NAME));
kind.fieldList.add(new EditField(StructuredName.MIDDLE_NAME, R.string.name_middle,
- FLAGS_PERSON_NAME).setOptional(true));
+ FLAGS_PERSON_NAME).setOptional(true).setPhoneticsColumn(StructuredName.PHONETIC_MIDDLE_NAME));
kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
- FLAGS_PERSON_NAME));
+ FLAGS_PERSON_NAME).setPhoneticsColumn(StructuredName.PHONETIC_FAMILY_NAME));
}
kind.fieldList.add(new EditField(StructuredName.SUFFIX, R.string.name_suffix,
FLAGS_PERSON_NAME).setOptional(true));
diff --git a/src/com/android/contacts/model/dataitem/PhoneDataItem.java b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
index 8d6cf8e..6355157 100644
--- a/src/com/android/contacts/model/dataitem/PhoneDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
@@ -31,6 +31,11 @@
public static final String KEY_FORMATTED_PHONE_NUMBER = "formattedPhoneNumber";
+ private boolean mTachyonReachable;
+ // Stores the custom reachable data item to provide extra data to the Entry created from this
+ // PhoneDataItem.
+ private DataItem mReachableDataItem;
+
/* package */ PhoneDataItem(ContentValues values) {
super(values);
}
@@ -54,6 +59,22 @@
return getContentValues().getAsString(Phone.LABEL);
}
+ public void setTachyonReachable(boolean tachyonReachable) {
+ mTachyonReachable = tachyonReachable;
+ }
+
+ public boolean isTachyonReachable() {
+ return mTachyonReachable;
+ }
+
+ public DataItem getReachableDataItem() {
+ return mReachableDataItem;
+ }
+
+ public void setReachableDataItem(DataItem reachableDataItem) {
+ mReachableDataItem = reachableDataItem;
+ }
+
public void computeFormattedPhoneNumber(String defaultCountryIso) {
final String phoneNumber = getNumber();
if (phoneNumber != null) {
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 2d83bf1..1c7469f 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -20,6 +20,7 @@
import android.database.Cursor;
import android.os.Bundle;
import android.preference.PreferenceActivity;
+import android.provider.ContactsContract.DisplayNameSources;
import android.provider.ContactsContract.ProviderStatus;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
@@ -202,17 +203,19 @@
boolean hasProfile = false;
String displayName = null;
long contactId = -1;
+ int displayNameSource = DisplayNameSources.UNDEFINED;
if (cursor != null && cursor.moveToFirst()) {
hasProfile = cursor.getInt(ProfileQuery.CONTACT_IS_USER_PROFILE) == 1;
displayName = cursor.getString(ProfileQuery.CONTACT_DISPLAY_NAME);
contactId = cursor.getLong(ProfileQuery.CONTACT_ID);
+ displayNameSource = cursor.getInt(ProfileQuery.DISPLAY_NAME_SOURCE);
}
if (hasProfile && TextUtils.isEmpty(displayName)) {
displayName = getString(R.string.missing_name);
}
final DisplayOptionsPreferenceFragment fragment = (DisplayOptionsPreferenceFragment)
getFragmentManager().findFragmentByTag(TAG_DISPLAY_OPTIONS);
- fragment.updateMyInfoPreference(hasProfile, displayName, contactId);
+ fragment.updateMyInfoPreference(hasProfile, displayName, contactId, displayNameSource);
}
@Override
diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index 22a6683..82e90b3 100644
--- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -33,11 +33,14 @@
import android.preference.PreferenceFragment;
import android.provider.BlockedNumberContract;
import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.DisplayNameSources;
import android.provider.ContactsContract.Profile;
import android.support.design.widget.Snackbar;
import android.support.v4.content.LocalBroadcastManager;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -111,17 +114,20 @@
Contacts._ID, // 0
Contacts.DISPLAY_NAME_PRIMARY, // 1
Contacts.IS_USER_PROFILE, // 2
+ Contacts.DISPLAY_NAME_SOURCE, // 3
};
private static final String[] PROFILE_PROJECTION_ALTERNATIVE = new String[] {
Contacts._ID, // 0
Contacts.DISPLAY_NAME_ALTERNATIVE, // 1
Contacts.IS_USER_PROFILE, // 2
+ Contacts.DISPLAY_NAME_SOURCE, // 3
};
public static final int CONTACT_ID = 0;
public static final int CONTACT_DISPLAY_NAME = 1;
public static final int CONTACT_IS_USER_PROFILE = 2;
+ public static final int DISPLAY_NAME_SOURCE = 3;
}
private String mNewLocalProfileExtra;
@@ -255,8 +261,13 @@
mRootView = null;
}
- public void updateMyInfoPreference(boolean hasProfile, String displayName, long contactId) {
- final CharSequence summary = hasProfile ? displayName : getString(R.string.set_up_profile);
+ public void updateMyInfoPreference(boolean hasProfile, String displayName, long contactId,
+ int displayNameSource) {
+ final CharSequence summary = !hasProfile ?
+ getString(R.string.set_up_profile) :
+ displayNameSource == DisplayNameSources.PHONE ?
+ BidiFormatter.getInstance().unicodeWrap(displayName, TextDirectionHeuristics.LTR) :
+ displayName;
mMyInfoPreference.setSummary(summary);
mHasProfile = hasProfile;
mProfileContactId = contactId;
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index 49da4c8..b0f7800 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -117,6 +117,7 @@
private final int mIconResourceId;
private final int mThirdAction;
private final Bundle mThirdExtras;
+ private final boolean mShouldApplyThirdIconColor;
public Entry(int id, Drawable mainIcon, String header, String subHeader,
Drawable subHeaderIcon, String text, Drawable textIcon,
@@ -125,7 +126,7 @@
Spannable alternateContentDescription, boolean shouldApplyColor, boolean isEditable,
EntryContextMenuInfo entryContextMenuInfo, Drawable thirdIcon, Intent thirdIntent,
String thirdContentDescription, int thirdAction, Bundle thirdExtras,
- int iconResourceId) {
+ boolean shouldApplyThirdIconColor, int iconResourceId) {
mId = id;
mIcon = mainIcon;
mHeader = header;
@@ -146,6 +147,7 @@
mThirdContentDescription = thirdContentDescription;
mThirdAction = thirdAction;
mThirdExtras = thirdExtras;
+ mShouldApplyThirdIconColor = shouldApplyThirdIconColor;
mIconResourceId = iconResourceId;
}
@@ -232,6 +234,10 @@
public Bundle getThirdExtras() {
return mThirdExtras;
}
+
+ boolean shouldApplyThirdIconColor() {
+ return mShouldApplyThirdIconColor;
+ }
}
public interface ExpandingEntryCardViewListener {
@@ -607,7 +613,7 @@
alternateIcon.setColorFilter(mThemeColorFilter);
}
Drawable thirdIcon = entry.getThirdIcon();
- if (thirdIcon != null) {
+ if (thirdIcon != null && entry.shouldApplyThirdIconColor()) {
thirdIcon.mutate();
thirdIcon.setColorFilter(mThemeColorFilter);
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index bd419b5..b249ca6 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -35,6 +35,7 @@
import android.content.Loader;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -107,6 +108,8 @@
import com.android.contacts.DynamicShortcuts;
import com.android.contacts.NfcHandler;
import com.android.contacts.R;
+import com.android.contacts.ShortcutIntentBuilder;
+import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
import com.android.contacts.activities.ContactEditorActivity;
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.activities.RequestDesiredPermissionsActivity;
@@ -126,8 +129,6 @@
import com.android.contacts.interactions.SmsInteractionsLoader;
import com.android.contacts.interactions.TouchPointManager;
import com.android.contacts.lettertiles.LetterTileDrawable;
-import com.android.contacts.ShortcutIntentBuilder;
-import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
import com.android.contacts.list.UiIntentActions;
import com.android.contacts.logging.Logger;
import com.android.contacts.logging.QuickContactEvent.ActionType;
@@ -246,6 +247,10 @@
@SuppressWarnings("deprecation")
private static final String LEGACY_AUTHORITY = android.provider.Contacts.AUTHORITY;
+ public static final String MIMETYPE_TACHYON =
+ "vnd.android.cursor.item/com.google.android.apps.tachyon.phone";
+ private static final String TACHYON_CALL_ACTION =
+ "com.google.android.apps.tachyon.action.CALL";
private static final String MIMETYPE_GPLUS_PROFILE =
"vnd.android.cursor.item/vnd.googleplus.profile";
private static final String GPLUS_PROFILE_DATA_5_VIEW_PROFILE = "view";
@@ -430,8 +435,6 @@
}
}
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
mHasIntentLaunched = true;
try {
final int actionType = intent.getIntExtra(EXTRA_ACTION_TYPE,
@@ -439,7 +442,15 @@
final String thirdPartyAction = intent.getStringExtra(EXTRA_THIRD_PARTY_ACTION);
Logger.logQuickContactEvent(mReferrer, mContactType,
CardType.UNKNOWN_CARD, actionType, thirdPartyAction);
- ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this, intent);
+ // For the tachyon call action, we need to use startActivityForResult and not
+ // add FLAG_ACTIVITY_NEW_TASK to the intent.
+ if (TACHYON_CALL_ACTION.equals(intent.getAction())) {
+ QuickContactActivity.this.startActivityForResult(intent, /* requestCode */ 0);
+ } else {
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ ImplicitIntentsUtil.startActivityInAppIfPossible(QuickContactActivity.this,
+ intent);
+ }
} catch (SecurityException ex) {
Toast.makeText(QuickContactActivity.this, R.string.missing_app,
Toast.LENGTH_SHORT).show();
@@ -1021,8 +1032,6 @@
mCachedCp2DataCardModel = null;
}
mContactLoader.forceLoad();
-
- NfcHandler.register(this, mLookupUri);
}
private void destroyInteractionLoaders() {
@@ -1145,6 +1154,7 @@
}
};
mEntriesAndActionsTask.execute();
+ NfcHandler.register(this, mContactData.getLookupUri());
}
private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {
@@ -1158,6 +1168,8 @@
final List<DataItem> sipCallDataItems = dataItemsMap.get(SipAddress.CONTENT_ITEM_TYPE);
if (phoneDataItems != null && phoneDataItems.size() == 1) {
mOnlyOnePhoneNumber = true;
+ } else {
+ mOnlyOnePhoneNumber = false;
}
String[] phoneNumbers = null;
if (phoneDataItems != null) {
@@ -1196,6 +1208,8 @@
final List<DataItem> emailDataItems = dataItemsMap.get(Email.CONTENT_ITEM_TYPE);
if (emailDataItems != null && emailDataItems.size() == 1) {
mOnlyOneEmail = true;
+ } else {
+ mOnlyOneEmail = false;
}
String[] emailAddresses = null;
if (emailDataItems != null) {
@@ -1328,6 +1342,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
/* iconResourceId = */ 0);
List<Entry> phoneticList = new ArrayList<>();
phoneticList.add(phoneticEntry);
@@ -1390,6 +1405,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
R.drawable.quantum_ic_phone_vd_theme_24);
final List<List<Entry>> promptEntries = new ArrayList<>();
@@ -1409,6 +1425,7 @@
/* EntryContextMenuInfo = */ null, /* thirdIcon = */ null,
/* thirdIntent = */ null, /* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE, /* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
R.drawable.quantum_ic_email_vd_theme_24);
promptEntries.add(new ArrayList<Entry>(1));
@@ -1442,8 +1459,8 @@
Trace.beginSection("Build data items map");
final Map<String, List<DataItem>> dataItemsMap = new HashMap<>();
+ final boolean tachyonEnabled = CallUtil.isTachyonEnabled(this);
- final ResolveCache cache = ResolveCache.getInstance(this);
for (RawContact rawContact : data.getRawContacts()) {
for (DataItem dataItem : rawContact.getDataItems()) {
dataItem.setRawContactId(rawContact.getId());
@@ -1451,17 +1468,23 @@
final String mimeType = dataItem.getMimeType();
if (mimeType == null) continue;
- final AccountType accountType = rawContact.getAccountType(this);
- final DataKind dataKind = AccountTypeManager.getInstance(this)
- .getKindOrFallback(accountType, mimeType);
- if (dataKind == null) continue;
+ if (!MIMETYPE_TACHYON.equals(mimeType)) {
+ // Only validate non-Tachyon mimetypes.
+ final AccountType accountType = rawContact.getAccountType(this);
+ final DataKind dataKind = AccountTypeManager.getInstance(this)
+ .getKindOrFallback(accountType, mimeType);
+ if (dataKind == null) continue;
- dataItem.setDataKind(dataKind);
+ dataItem.setDataKind(dataKind);
- final boolean hasData = !TextUtils.isEmpty(dataItem.buildDataString(this,
- dataKind));
+ final boolean hasData = !TextUtils.isEmpty(dataItem.buildDataString(this,
+ dataKind));
- if (isMimeExcluded(mimeType) || !hasData) continue;
+ if (isMimeExcluded(mimeType) || !hasData) continue;
+ } else if (!tachyonEnabled) {
+ // If tachyon isn't enabled, skip its mimetypes.
+ continue;
+ }
List<DataItem> dataItemListByType = dataItemsMap.get(mimeType);
if (dataItemListByType == null) {
@@ -1472,6 +1495,7 @@
}
}
Trace.endSection();
+ bindReachability(dataItemsMap);
Trace.beginSection("sort within mimetypes");
/*
@@ -1529,6 +1553,28 @@
}
/**
+ * Bind the custom data items to each {@link PhoneDataItem} that is Tachyon reachable, the data
+ * will be needed when creating the {@link Entry} for the {@link PhoneDataItem}.
+ */
+ private void bindReachability(Map<String, List<DataItem>> dataItemsMap) {
+ final List<DataItem> phoneItems = dataItemsMap.get(Phone.CONTENT_ITEM_TYPE);
+ final List<DataItem> tachyonItems = dataItemsMap.get(MIMETYPE_TACHYON);
+ if (phoneItems != null && tachyonItems != null) {
+ for (DataItem phone : phoneItems) {
+ if (phone instanceof PhoneDataItem && ((PhoneDataItem) phone).getNumber() != null) {
+ for (DataItem tachyonItem : tachyonItems) {
+ if (((PhoneDataItem) phone).getNumber().equals(
+ tachyonItem.getContentValues().getAsString(Data.DATA1))) {
+ ((PhoneDataItem) phone).setTachyonReachable(true);
+ ((PhoneDataItem) phone).setReachableDataItem(tachyonItem);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
* Class used to hold the About card and Contact cards' data model that gets generated
* on a background thread. All data is from CP2.
*/
@@ -1575,6 +1621,7 @@
Spannable smsContentDescription = null;
Intent intent = null;
boolean shouldApplyColor = true;
+ boolean shouldApplyThirdIconColor = true;
Drawable alternateIcon = null;
Intent alternateIntent = null;
StringBuilder alternateContentDescription = new StringBuilder();
@@ -1747,6 +1794,9 @@
boolean isPresenceEnabled =
(videoCapability & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
boolean isVideoEnabled = (videoCapability & CallUtil.VIDEO_CALLING_ENABLED) != 0;
+ // Check to ensure carrier presence indicates the number supports video calling.
+ int carrierPresence = dataItem.getCarrierPresence();
+ boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
if (CallUtil.isCallWithSubjectSupported(context)) {
thirdIcon = res.getDrawable(R.drawable.quantum_ic_perm_phone_msg_vd_theme_24);
@@ -1770,20 +1820,23 @@
phone.getFormattedPhoneNumber());
thirdExtras.putString(CallSubjectDialog.ARG_NUMBER_LABEL,
phoneLabel);
- } else if (isVideoEnabled) {
- // Check to ensure carrier presence indicates the number supports video calling.
- int carrierPresence = dataItem.getCarrierPresence();
- boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
-
- if ((isPresenceEnabled && isPresent) || !isPresenceEnabled) {
- thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
- thirdAction = Entry.ACTION_INTENT;
- thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
- CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
- thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
- thirdContentDescription =
- res.getString(R.string.description_video_call);
- }
+ } else if (isVideoEnabled && (!isPresenceEnabled || isPresent)) {
+ thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+ thirdAction = Entry.ACTION_INTENT;
+ thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
+ CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
+ thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
+ thirdContentDescription =
+ res.getString(R.string.description_video_call);
+ } else if (CallUtil.isTachyonEnabled(context)
+ && ((PhoneDataItem) dataItem).isTachyonReachable()) {
+ thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+ thirdAction = Entry.ACTION_INTENT;
+ thirdIntent = new Intent(TACHYON_CALL_ACTION);
+ thirdIntent.setData(
+ Uri.fromParts(PhoneAccount.SCHEME_TEL, phone.getNumber(), null));
+ thirdContentDescription = ((PhoneDataItem) dataItem).getReachableDataItem()
+ .getContentValues().getAsString(Data.DATA2);
}
}
} else if (dataItem instanceof EmailDataItem) {
@@ -1870,6 +1923,10 @@
aboutCardName.value = res.getString(R.string.about_card_title);
}
}
+ } else if (CallUtil.isTachyonEnabled(context) && MIMETYPE_TACHYON.equals(
+ dataItem.getMimeType())) {
+ // Skip these actions. They will be placed by the phone number.
+ return null;
} else {
// Custom DataItem
header = dataItem.buildDataStringForDisplay(context, kind);
@@ -1882,7 +1939,6 @@
if (intent != null) {
final String mimetype = intent.getType();
-
// Build advanced entry for known 3p types. Otherwise default to ResolveCache icon.
if (MIMETYPE_HANGOUTS.equals(mimetype)) {
// If a secondDataItem is available, use it to build an entry with
@@ -1964,7 +2020,7 @@
: smsContentDescription,
shouldApplyColor, isEditable,
entryContextMenuInfo, thirdIcon, thirdIntent, thirdContentDescription, thirdAction,
- thirdExtras, iconResourceId);
+ thirdExtras, shouldApplyThirdIconColor, iconResourceId);
}
private List<Entry> dataItemsToEntries(List<DataItem> dataItems,
@@ -2265,6 +2321,7 @@
/* thirdContentDescription = */ null,
/* thirdAction = */ Entry.ACTION_NONE,
/* thirdActionExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
interaction.getIconResourceId()));
}
return entries;
@@ -2497,7 +2554,9 @@
/* isEditable = */ false, /* EntryContextMenuInfo = */ null,
/* thirdIcon = */ null, /* thirdIntent = */ null,
/* thirdContentDescription = */ null, /* thirdAction = */ Entry.ACTION_NONE,
- /* thirdExtras = */ null, R.drawable.quantum_ic_history_vd_theme_24);
+ /* thirdExtras = */ null,
+ /* shouldApplyThirdIconColor = */ true,
+ R.drawable.quantum_ic_history_vd_theme_24);
final List<List<Entry>> permissionExplanationEntries = new ArrayList<>();
permissionExplanationEntries.add(new ArrayList<Entry>());
@@ -2643,21 +2702,26 @@
* Creates a launcher shortcut with the current contact.
*/
private void createLauncherShortcutWithContact() {
- final ShortcutIntentBuilder builder = new ShortcutIntentBuilder(this,
- new OnShortcutIntentCreatedListener() {
+ if (BuildCompat.isAtLeastO()) {
+ final ShortcutManager shortcutManager = (ShortcutManager)
+ getSystemService(SHORTCUT_SERVICE);
+ final DynamicShortcuts shortcuts =
+ new DynamicShortcuts(QuickContactActivity.this);
+ String displayName = mContactData.getDisplayName();
+ if (displayName == null) {
+ displayName = getString(R.string.missing_name);
+ }
+ final ShortcutInfo shortcutInfo = shortcuts.getQuickContactShortcutInfo(
+ mContactData.getId(), mContactData.getLookupKey(), displayName);
+ if (shortcutInfo != null) {
+ shortcutManager.requestPinShortcut(shortcutInfo, null);
+ }
+ } else {
+ final ShortcutIntentBuilder builder = new ShortcutIntentBuilder(this,
+ new OnShortcutIntentCreatedListener() {
- @Override
- public void onShortcutIntentCreated(Uri uri, Intent shortcutIntent) {
- if (BuildCompat.isAtLeastO()) {
- final ShortcutManager shortcutManager = (ShortcutManager)
- getSystemService(SHORTCUT_SERVICE);
- final DynamicShortcuts shortcuts =
- new DynamicShortcuts(QuickContactActivity.this);
- shortcutManager.requestPinShortcut(
- shortcuts.getQuickContactShortcutInfo(
- mContactData.getId(), mContactData.getLookupKey(),
- mContactData.getDisplayName()), null);
- } else {
+ @Override
+ public void onShortcutIntentCreated(Uri uri, Intent shortcutIntent) {
// Broadcast the shortcutIntent to the launcher to create a
// shortcut to this contact
shortcutIntent.setAction(ACTION_INSTALL_SHORTCUT);
@@ -2673,9 +2737,9 @@
Toast.makeText(QuickContactActivity.this, toastMessage,
Toast.LENGTH_SHORT).show();
}
- }
- });
- builder.createContactShortcutIntent(mContactData.getLookupUri());
+ });
+ builder.createContactShortcutIntent(mContactData.getLookupUri());
+ }
}
private boolean isShortcutCreatable() {
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index 5787d62..a6b58cc 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -91,9 +91,9 @@
}
final AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setMessage(message)
- .setPositiveButton(android.R.string.ok, new RequestCancelListener())
+ .setPositiveButton(R.string.yes_button, new RequestCancelListener())
.setOnCancelListener(mCancelListener)
- .setNegativeButton(android.R.string.cancel, mCancelListener);
+ .setNegativeButton(R.string.no_button, mCancelListener);
return builder.create();
} else if (id == R.id.dialog_cancel_failed) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this)
