Merge commit 'a7e92c297e6380917411f7271b036d724fd00b14' into HEAD
Change-Id: I6a87aa70ccb73422ca581fe6b0a0968ff7e34989
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/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/values-bn/strings.xml b/res/values-bn/strings.xml
index da6f384..dce2ab3 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,7 +523,7 @@
<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>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index cf747c2..ef0c46d 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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b15320a..25afdb4 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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2381a4e..21b9105 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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3edd3b6..803c8e4 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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 07335de..c03263a 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>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5a0f51f..a70087e 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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 688e0cd..a600987 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>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 6abc4e7..ec72d11 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>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 70ee150..26a6250 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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4f4f7e1..9326229 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -159,7 +159,7 @@
<string name="cancel_button_content_description" msgid="1288652456274531846">"रद्द करें"</string>
<string name="back_arrow_content_description" msgid="4355362760545735065">"वापस जाएं"</string>
<string name="action_menu_back_from_edit_select" msgid="6435476408621731420">"बंद करें"</string>
- <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"चयनित संपर्क के संपादन पर जाएं? आपके द्वारा अभी तक दर्ज की गई जानकारी की प्रतिलिपि बनाई जाएगी."</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"चयनित संपर्क के संपादन पर जाएं? आपके द्वारा अभी तक दर्ज की गई जानकारी की कॉपी बनाई जाएगी."</string>
<string name="contact_directory_description" msgid="683398073603909119">"निर्देशिका <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"सेटिंग"</string>
<string name="menu_settings" msgid="377929915873428211">"सेटिंग"</string>
@@ -174,10 +174,10 @@
<string name="create_group_item_label" msgid="3263064599743742865">"नया बनाएं…"</string>
<string name="delete_group_dialog_message" msgid="335713829185261371">"लेबल \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" हटाएं? (संपर्क स्वयं नहीं हटाए जाएंगे.)"</string>
<string name="toast_join_with_empty_contact" msgid="1215465657839085613">"अन्य संपर्क से लिंक करने से पहले संपर्क नाम लिखें."</string>
- <string name="copy_text" msgid="3257145021583508761">"क्लिपबोर्ड पर प्रतिलिपि बनाएं"</string>
+ <string name="copy_text" msgid="3257145021583508761">"क्लिपबोर्ड में कॉपी करें"</string>
<string name="set_default" msgid="4417505153468300351">"सामान्य सेट करें"</string>
<string name="clear_default" msgid="7193185801596678067">"सामान्य साफ़ करें"</string>
- <string name="toast_text_copied" msgid="5143776250008541719">"लेख की प्रतिलिपि बनाई गई"</string>
+ <string name="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_keep_editing_button" msgid="3316573928085916146">"रद्द करें"</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>
@@ -239,7 +239,7 @@
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"संपर्क लिंक करें"</string>
<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_duplicates_title" msgid="9107788743178980902">"संभावित कॉपी"</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>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 551e3c6..064f606 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>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 479c7a6..cf9fd75 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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 3625f84..903105e 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>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 597014c..fc724ef 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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index cec4a15..4aa7917 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -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>
@@ -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>
@@ -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>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b7a9f91..0dd7ed8 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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7fc42e7..25a381e 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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2c31633..c18ad3c 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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 18e0cc3..f60f241 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -66,15 +66,15 @@
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Contactos <xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminados"</string>
<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"<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>… foram eliminados"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
- <item quantity="one">Contacts deleted</item>
+ <item quantity="one">Contacto eliminado</item>
<item quantity="other">Contactos eliminados</item>
</plurals>
<plurals name="contacts_count" formatted="false" msgid="8696793457340503668">
- <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contactos</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Da Google"</string>
@@ -137,7 +137,7 @@
<string name="menu_add_contact" msgid="3198704337220892684">"Adicionar aos contactos"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"Adicionar"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">Share contacts via</item>
+ <item quantity="one">Partilhar contacto através de</item>
<item quantity="other">Partilhar contactos através de</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"Selecionar conta"</string>
@@ -396,11 +396,11 @@
<string name="import_from_sim" msgid="6912071635295799131">"Cartão SIM"</string>
<string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
<plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
- <item quantity="one">%1$d contacts</item>
+ <item quantity="one">1 contacto</item>
<item quantity="other">%1$d contactos</item>
</plurals>
<plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
- <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> contacts • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contactos • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
</plurals>
<string name="import_from_vcf_file" msgid="8662528435646418203">"Ficheiro .vcf"</string>
@@ -509,7 +509,7 @@
<string name="sim_import_empty_message" msgid="7743815244380189651">"Sem contactos no cartão SIM"</string>
<string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"O contacto já existe na sua lista"</string>
<plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
- <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> SIM contacts imported</item>
+ <item quantity="one">1 contacto do cartão SIM importado</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactos do cartão SIM importados</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51b62a9..2a2abe9 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>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fe4817f..4794935 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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9d3efd6..327fb29 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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 16671a3..6121f28 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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 294e7da..5ad346f 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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4b64456..c4af9bd 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>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e394ea3..f5d40ec 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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 29477bb..4981f7f 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>
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/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index da68ec6..a250b4e 100644
--- 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);
@@ -1277,6 +1282,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/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/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/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 9e4bbf2..b249ca6 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1032,8 +1032,6 @@
mCachedCp2DataCardModel = null;
}
mContactLoader.forceLoad();
-
- NfcHandler.register(this, mLookupUri);
}
private void destroyInteractionLoaders() {
@@ -1156,6 +1154,7 @@
}
};
mEntriesAndActionsTask.execute();
+ NfcHandler.register(this, mContactData.getLookupUri());
}
private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {
