Merge "Send broadcast to request high res photo sync" into qt-dev
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0c961aa..b8c932a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -455,7 +455,7 @@
<string name="settings_my_info_title" msgid="1534272456405343119">"Мая інфармацыя"</string>
<string name="set_up_profile" msgid="7370213843590143771">"Наладзьце ваш профіль"</string>
<string name="setting_about" msgid="7014388749752042863">"Інфармацыя аб Кантактах"</string>
- <string name="share_favorite_contacts" msgid="4280926751003081042">"Абагуліць улюбёныя кантакты"</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="dialog_export" msgid="1628001095187741417">"Экспартаваць кантакты"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 021be24..9478f73 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -24,7 +24,7 @@
<string name="shortcutMessageContact" msgid="2460337253595976198">"Direktna poruka"</string>
<string name="shortcutActivityTitle" msgid="1504383567778497348">"Odaberi kontakt"</string>
<string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodaj u kontakt"</string>
- <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odabir kontakta"</string>
+ <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odaberite kontakt"</string>
<string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Odaberi"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Kreiraj novi kontakt"</string>
<string name="searchHint" msgid="8482945356247760701">"Pretražite kontakte"</string>
@@ -186,7 +186,7 @@
<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">"Pretraži kontakte"</string>
+ <string name="enter_contact_name" msgid="4594274696120278368">"Pretražite kontakte"</string>
<string name="title_edit_group" msgid="8602752287270586734">"Uklanjanje kontakata"</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>
@@ -460,7 +460,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">"Pretraži kontakte"</string>
+ <string name="hint_findContacts" msgid="7128627979899070325">"Pretražite kontakte"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Omiljeni"</string>
<string name="menu_import" msgid="6107961135813836467">"Uvoz"</string>
<string name="menu_export" msgid="2658783911863503902">"Izvoz"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c5643f5..822f298 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -466,7 +466,7 @@
<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>
+ <string name="hint_findContacts" msgid="7128627979899070325">"Prohledat kontakty"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Oblíbené"</string>
<string name="menu_import" msgid="6107961135813836467">"Importovat"</string>
<string name="menu_export" msgid="2658783911863503902">"Exportovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3451ebd..ac461c5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -286,7 +286,7 @@
<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send besked)"</string>
<string name="description_video_call" msgid="7120921378651700947">"Foretag videoopkald"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"Vil du rydde de ofte kontaktede?"</string>
- <string name="clearFrequentsConfirmation" msgid="2270554975938265734">"Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i dine apps Kontakter og Telefon. Du vil samtidig tvinge e-mailapps til at lære dine adressepræferencer fra bunden."</string>
+ <string name="clearFrequentsConfirmation" msgid="2270554975938265734">"Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i dine apps Kontakter og Telefon. Du vil samtidig tvinge mailapps til at lære dine adressepræferencer fra bunden."</string>
<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"Rydder ofte kontaktede personer…"</string>
<string name="status_available" msgid="5586870015822828392">"Tilgængelig"</string>
<string name="status_away" msgid="1838861100379804730">"Ikke til stede"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3e7db0f..c75dc4c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -243,8 +243,8 @@
<string name="call_custom" msgid="6385303130912713318">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> पर कॉल करें"</string>
<string name="call_home" msgid="1990519474420545392">"घर के फ़ोन नंबर पर कॉल करें"</string>
<string name="call_mobile" msgid="7502236805487609178">"मोबाइल पर कॉल करें"</string>
- <string name="call_work" msgid="5328785911463744028">"कार्यस्थल के फ़ोन नंबर पर कॉल करें"</string>
- <string name="call_fax_work" msgid="7467763592359059243">"कार्यस्थल फ़ैक्स पर कॉल करें"</string>
+ <string name="call_work" msgid="5328785911463744028">"दफ़्तर के फ़ोन नंबर पर कॉल करें"</string>
+ <string name="call_fax_work" msgid="7467763592359059243">"दफ़्तर फ़ैक्स पर कॉल करें"</string>
<string name="call_fax_home" msgid="8342175628887571876">"घर के फ़ैक्स पर कॉल करें"</string>
<string name="call_pager" msgid="9003902812293983281">"पेजर पर कॉल करें"</string>
<string name="call_other" msgid="8563753966926932052">"कॉल करें"</string>
@@ -257,16 +257,16 @@
<string name="call_radio" msgid="8296755876398357063">"रेडियो पर कॉल करें"</string>
<string name="call_telex" msgid="2223170774548648114">"इस टेलेक्स पर कॉल करें"</string>
<string name="call_tty_tdd" msgid="8951266948204379604">"TTY/TDD फ़ोन नंबर पर कॉल करें"</string>
- <string name="call_work_mobile" msgid="8707874281430105394">"कार्यस्थल मोबाइल पर कॉल करें"</string>
- <string name="call_work_pager" msgid="3419348514157949008">"कार्यस्थल पेजर पर कॉल करें"</string>
+ <string name="call_work_mobile" msgid="8707874281430105394">"दफ़्तर मोबाइल पर कॉल करें"</string>
+ <string name="call_work_pager" msgid="3419348514157949008">"दफ़्तर पेजर पर कॉल करें"</string>
<string name="call_assistant" msgid="670941612175068337">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> पर कॉल करें"</string>
<string name="call_mms" msgid="6274041545876221437">"MMS फ़ोन नंबर पर कॉल करें"</string>
<string name="call_by_shortcut" msgid="2566802538698913124">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (कॉल करें)"</string>
<string name="sms_custom" msgid="415060214233647603">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> लिखित संदेश भेजें"</string>
<string name="sms_home" msgid="7524332261493162995">"घर के फ़ोन पर SMS भेजें"</string>
<string name="sms_mobile" msgid="5200107250451030769">"मोबाइल पर SMS भेजें"</string>
- <string name="sms_work" msgid="2269624156655267740">"कार्यस्थल के फ़ोन नंबर पर SMS भेजें"</string>
- <string name="sms_fax_work" msgid="8028189067816907075">"कार्यस्थल फ़ैक्स नंबर पर SMS भेजें"</string>
+ <string name="sms_work" msgid="2269624156655267740">"दफ़्तर के फ़ोन नंबर पर SMS भेजें"</string>
+ <string name="sms_fax_work" msgid="8028189067816907075">"दफ़्तर फ़ैक्स नंबर पर SMS भेजें"</string>
<string name="sms_fax_home" msgid="9204042076306809634">"घर के फ़ैक्स पर SMS भेजें"</string>
<string name="sms_pager" msgid="7730404569637015192">"पेजर पर SMS भेजें"</string>
<string name="sms_other" msgid="806127844607642331">"SMS भेजें"</string>
@@ -279,8 +279,8 @@
<string name="sms_radio" msgid="3329166673433967820">"रेडियो फ़ोन नंबर पर SMS भेजें"</string>
<string name="sms_telex" msgid="9034802430065267848">"टेलेक्स फ़ोन नंबर पर SMS भेजें"</string>
<string name="sms_tty_tdd" msgid="6782284969132531532">"TTY/TDD को SMS भेजें"</string>
- <string name="sms_work_mobile" msgid="2459939960512702560">"कार्यस्थल मोबाइल को SMS भेजें"</string>
- <string name="sms_work_pager" msgid="5566924423316960597">"कार्यस्थल पेजर पर SMS भेजें"</string>
+ <string name="sms_work_mobile" msgid="2459939960512702560">"दफ़्तर मोबाइल को SMS भेजें"</string>
+ <string name="sms_work_pager" msgid="5566924423316960597">"दफ़्तर पेजर पर SMS भेजें"</string>
<string name="sms_assistant" msgid="2773424339923116234">"<xliff:g id="ASSISTANT">%s</xliff:g> को SMS भेजें"</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>
@@ -299,7 +299,7 @@
<string name="missing_name" msgid="8745511583852904385">"(कोई नाम नहीं)"</string>
<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="list_filter_phones_work" msgid="1470173699551475015">"वर्क प्रोफ़ाइल के संपर्क"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"नई जानकारी देखें"</string>
<string name="account_phone" msgid="7128032778471187553">"डिवाइस"</string>
<string name="account_sim" msgid="6519016427905087952">"सिम"</string>
@@ -332,7 +332,7 @@
<string name="groupsLabel" msgid="7000816729542098972">"लेबल"</string>
<string name="email_home" msgid="8573740658148184279">"घर का ईमेल"</string>
<string name="email_mobile" msgid="2042889209787989814">"मोबाइल पर ईमेल भेजें"</string>
- <string name="email_work" msgid="2807430017302722689">"कार्यस्थल का ईमेल"</string>
+ <string name="email_work" msgid="2807430017302722689">"दफ़्तर का ईमेल"</string>
<string name="email_other" msgid="3454004077967657109">"ईमेल भेजें"</string>
<string name="email_custom" msgid="5536404237099078802">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> को ईमेल करें"</string>
<string name="email" msgid="5668400997660065897">"ईमेल भेजें"</string>
@@ -342,7 +342,7 @@
<string name="postal_postcode" msgid="572136414136673751">"ज़िप कोड"</string>
<string name="postal_country" msgid="7638264508416368690">"देश"</string>
<string name="map_home" msgid="1243547733423343982">"घर का पता देखें"</string>
- <string name="map_work" msgid="1360474076921878088">"कार्यस्थल का पता देखें"</string>
+ <string name="map_work" msgid="1360474076921878088">"दफ़्तर का पता देखें"</string>
<string name="map_other" msgid="3817820803587012641">"पता देखें"</string>
<string name="map_custom" msgid="8761800628069473526">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> पता देखें"</string>
<string name="chat_aim" msgid="2588492205291249142">"AIM का उपयोग करके बातचीत करें"</string>
@@ -401,7 +401,7 @@
<string name="fail_reason_io_error" msgid="6748358842976073255">"I/O गड़बड़ी"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"स्मृति काफ़ी नहीं है. हो सकता है फ़ाइल बहुत बड़ी हो."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"प्रारूप समर्थित नहीं है."</string>
- <string name="exporting_vcard_finished_title" msgid="4767045779458185251">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात करना पूर्ण."</string>
+ <string name="exporting_vcard_finished_title" msgid="4767045779458185251">"<xliff:g id="FILENAME">%s</xliff:g> का एक्सपोर्ट पूरा हुआ."</string>
<string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"संपर्कों का निर्यात किया जाना खत्म हो गया."</string>
<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"संपर्कों का निर्यात पूरा हो गया है, संपर्क शेयर करने के लिए नोटिफ़िकेशन क्लिक करें."</string>
<string name="touch_to_share_contacts" msgid="4882485525268469736">"संपर्क शेयर करने के लिए टैप करें."</string>
@@ -415,7 +415,7 @@
<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="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> आयात करना पूर्ण"</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>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"फ़ाइल शीघ्र ही आयात की जाएगी."</string>
@@ -504,7 +504,7 @@
<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="importing_sim_finished_title" msgid="5196369441294050721">"SIM कार्ड का आयात पूर्ण"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM कार्ड का इंपोर्ट पूरा हुआ"</string>
<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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1b528df..b94f88d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -207,7 +207,7 @@
<string name="date_time_set" msgid="4761419824439606690">"Setel"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
<string name="header_organization_entry" msgid="8515394955666265406">"Organisasi"</string>
- <string name="header_nickname_entry" msgid="6743561883967451485">"Julukan"</string>
+ <string name="header_nickname_entry" msgid="6743561883967451485">"Nama"</string>
<string name="header_note_entry" msgid="4320190426480612344">"Catatan"</string>
<string name="header_website_entry" msgid="1411467850000824745">"Situs web"</string>
<string name="header_event_entry" msgid="6738250422744401460">"Acara"</string>
@@ -364,7 +364,7 @@
<string name="announce_expanded_fields" msgid="1075947220478530622">"Diperluas"</string>
<string name="announce_collapsed_fields" msgid="6414231530177338704">"Diciutkan"</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"Semua kontak"</string>
- <string name="list_filter_all_starred" msgid="5031734941601931356">"Yang berbintang"</string>
+ <string name="list_filter_all_starred" msgid="5031734941601931356">"Berbintang"</string>
<string name="list_filter_customize" msgid="4789963356004169321">"Khusus"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Kontak"</string>
<string name="display_ungrouped" msgid="6885954210243119591">"Semua kontak lainnya"</string>
@@ -472,7 +472,7 @@
<string name="call_subject_type_and_number" msgid="7667188212129152558">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
<string name="about_build_version" msgid="1765533099416999801">"Versi build"</string>
<string name="about_open_source_licenses" msgid="6479990452352919641">"Lisensi open source"</string>
- <string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detail lisensi untuk software sumber terbuka"</string>
+ <string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detail lisensi untuk software open source"</string>
<string name="about_privacy_policy" msgid="3705518622499152626">"Kebijakan privasi"</string>
<string name="about_terms_of_service" msgid="4642400812150296723">"Persyaratan layanan"</string>
<string name="activity_title_licenses" msgid="5467767062737708066">"Lisensi open source"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4974202..0b6a4b6 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -24,7 +24,7 @@
<string name="shortcutMessageContact" msgid="2460337253595976198">"Түз SMS"</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>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 51e261e..4c5e1d0 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 02c992d..2d4e857 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -66,16 +66,16 @@
<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"<xliff:g id="NAME_0">%1$s</xliff:g> आणि <xliff:g id="NAME_1">%2$s</xliff:g> हटविले"</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>... हटविले"</string>
<plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
- <item quantity="one">संपर्क हटविला</item>
<item quantity="other">संपर्क हटविले</item>
+ <item quantity="one">संपर्क हटविला</item>
</plurals>
<plurals name="contacts_count" formatted="false" msgid="8696793457340503668">
- <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> संपर्क</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> संपर्क</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> संपर्क</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google वरील"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> मधील"</string>
@@ -137,8 +137,8 @@
<string name="menu_add_contact" msgid="3198704337220892684">"संपर्कांमध्ये जोडा"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"जोडा"</string>
<plurals name="title_share_via" formatted="false" msgid="5886112726191455415">
- <item quantity="one">संपर्क याद्वारे शेअर करा</item>
<item quantity="other">संपर्क याद्वारे शेअर करा</item>
+ <item quantity="one">संपर्क याद्वारे शेअर करा</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"खाते निवडा"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"लेबल बनवा"</string>
@@ -379,12 +379,12 @@
<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">
- <item quantity="one">%1$d संपर्क</item>
<item quantity="other">%1$d संपर्क</item>
+ <item quantity="one">1 संपर्क</item>
</plurals>
<plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
- <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
</plurals>
<string name="import_from_vcf_file" msgid="8662528435646418203">".vcf फाईल"</string>
<string name="nothing_to_import_message" msgid="1651921906873335656">"इंपोर्ट करण्यासाठी काहीही नाही"</string>
@@ -472,7 +472,7 @@
<string name="call_subject_type_and_number" msgid="7667188212129152558">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
<string name="about_build_version" msgid="1765533099416999801">"बिल्ड आवृत्ती"</string>
<string name="about_open_source_licenses" msgid="6479990452352919641">"मुक्त स्रोत परवाने"</string>
- <string name="about_open_source_licenses_summary" msgid="57418386931763994">"मुक्त स्त्रोत सॉफ्टवेअरसाठी परवाना तपशील"</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="activity_title_licenses" msgid="5467767062737708066">"मुक्त स्रोत परवाने"</string>
@@ -489,8 +489,8 @@
<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> सिम संपर्क इंपोर्ट केला</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> सिम संपर्क इंपोर्ट केले</item>
+ <item quantity="one">1 सिम संपर्क इंपोर्ट केला</item>
</plurals>
<string name="sim_import_failed_toast" msgid="5559267299793622705">"सिम संपर्क इंपोर्ट करण्यात अयशस्वी"</string>
<string name="sim_import_title" msgid="2511154832820812822">"सिम वरून इंपोर्ट करा"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 817b563..3b1626c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -132,7 +132,7 @@
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"முந்தைய திரைக்குச் செல்ல கிளிக் செய்க"</string>
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"மொபைல் எண்ணைச் சேர்க்கவும்"</string>
<string name="quickcontact_add_email" msgid="739298028384348482">"மின்னஞ்சலைச் சேர்க்கவும்"</string>
- <string name="missing_app" msgid="1466111003546611387">"இந்தச் செயலைச் செய்ய பயன்பாடு எதுவுமில்லை."</string>
+ <string name="missing_app" msgid="1466111003546611387">"இந்தச் செயலைச் செய்ய ஆப்ஸ் எதுவுமில்லை."</string>
<string name="menu_share" msgid="943789700636542260">"பகிர்"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"தொடர்புகளில் சேர்"</string>
<string name="menu_add_contacts" msgid="4465646512002163011">"சேர்"</string>
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index fcbfba9..6d206b6 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -992,6 +992,14 @@
}
private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {
+ final Map<String, List<DataItem>> dataItemsMap = cp2DataCardModel.dataItemsMap;
+
+ final List<DataItem> phoneDataItems = dataItemsMap.get(Phone.CONTENT_ITEM_TYPE);
+ mOnlyOnePhoneNumber = phoneDataItems != null && phoneDataItems.size() == 1;
+
+ final List<DataItem> emailDataItems = dataItemsMap.get(Email.CONTENT_ITEM_TYPE);
+ mOnlyOneEmail = emailDataItems != null && emailDataItems.size() == 1;
+
populateContactAndAboutCard(cp2DataCardModel, /* shouldAddPhoneticName */ true);
}