[automerger skipped] Import translations. DO NOT MERGE
am: caabbee24e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic1222c60afe77701f5757b9c17addd3a05ecbfdc
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0c961aa..61314fe 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -474,7 +474,7 @@
<string name="contact_status_update_attribution" msgid="752179367353018597">"праз <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> праз <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
<string name="action_menu_back_from_search" msgid="8793348588949233348">"спыніць пошук"</string>
- <string name="description_clear_search" msgid="688023606766232904">"Ачысціць поле пошуку"</string>
+ <string name="description_clear_search" msgid="688023606766232904">"Ачысціць пошук"</string>
<string name="select_account_dialog_title" msgid="5478489655696599219">"Уліковы запіс"</string>
<string name="set_default_account" msgid="4311613760725609801">"Заўсёды ўжываць гэта для выклікаў"</string>
<string name="call_with_a_note" msgid="8389827628360791676">"Выклікаць з нататкай"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 021be24..1bcb2d0 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -27,7 +27,7 @@
<string name="contactPickerActivityTitle" msgid="4301062192337417640">"Odabir kontakta"</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>
+ <string name="searchHint" msgid="8482945356247760701">"Pretraži kontakte"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Dodaj u omiljeno"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Ukloni iz omiljenih"</string>
<string name="description_action_menu_remove_star" msgid="4699640108012265178">"Uklonjeno iz omiljenog"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3e7db0f..af7a61f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -48,14 +48,14 @@
<string name="splitConfirmation" msgid="7342030840130187290">"एकाधिक खातों में इन संपर्कों को अनलिंक करें?"</string>
<string name="splitConfirmation_positive_button" msgid="9129409098807939699">"अनलिंक करें"</string>
<string name="splitConfirmationWithPendingChanges" msgid="7719062163511895696">"क्या आप पहले से किए गए बदलावों को सहेजना और इस संपर्क को एकाधिक संपर्कों में अनलिंक करना चाहते हैं?"</string>
- <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"सेव करें और अनलिंक करें"</string>
+ <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"सहेजें और अनलिंक करें"</string>
<string name="joinConfirmation" msgid="8262614843581924365">"क्या आप पहले से किए गए बदलावों को सहेजना और चयनित संपर्कों से लिंक करना चाहते हैं?"</string>
- <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"सेव करें और लिंक करें"</string>
+ <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"सहेजें और लिंक करें"</string>
<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"लिंक किए जा रहे हैं"</string>
<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"अनलिंक कर रहे हैं"</string>
<string name="menu_joinAggregate" msgid="3599512127797513606">"लिंक करें"</string>
<string name="menu_linkedContacts" msgid="400444389718855621">"लिंक किए गए संपर्क देखें"</string>
- <string name="menu_save" msgid="1727844363591825909">"सेव करें"</string>
+ <string name="menu_save" msgid="1727844363591825909">"सहेजें"</string>
<string name="titleJoinContactDataWith" msgid="6825255752748313944">"संपर्क लिंक करें"</string>
<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"वह संपर्क चुनें जिसे आप <xliff:g id="NAME">%s</xliff:g> के साथ लिंक करना चाहते हैं:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"सुझाए गए संपर्क"</string>
@@ -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>
+ <item quantity="other">इसके द्वारा संपर्कों को शेयर करें</item>
</plurals>
<string name="dialog_new_group_account" msgid="3451312333591556651">"खाता चुनें"</string>
<string name="group_name_dialog_insert_title" msgid="2668452090427027941">"लेबल बनाएं"</string>
@@ -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>
@@ -200,7 +200,7 @@
<string name="add_new_account" msgid="5748627740680940264">"नया खाता जोड़ें"</string>
<string name="menu_export_database" msgid="2659719297530170820">"डेटाबेस फ़ाइलें निर्यात करें"</string>
<string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"नया संपर्क बनाएं"</string>
- <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"ज़्यादा देखें"</string>
+ <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"अधिक देखें"</string>
<string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"कम देखें"</string>
<string name="about_card_title" msgid="2920942314212825637">"संक्षिप्त विवरण"</string>
<string name="toast_making_personal_copy" msgid="288549957278065542">"एक व्यक्तिगत कॉपी बना रहा है…"</string>
@@ -216,7 +216,7 @@
<string name="header_email_entry" msgid="8666093061171624478">"ईमेल"</string>
<string name="header_phone_entry" msgid="8450980572274173570">"फ़ोन"</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थान के लिए दिशा निर्देश"</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>
@@ -320,7 +320,7 @@
<string name="imLabelsGroup" msgid="3898238486262614027">"आईएम"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"संगठन"</string>
<string name="relationLabelsGroup" msgid="1854373894284572781">"संबंध"</string>
- <string name="eventLabelsGroup" msgid="7960408705307831289">"विशेष तारीख"</string>
+ <string name="eventLabelsGroup" msgid="7960408705307831289">"विशेष दिनांक"</string>
<string name="sms" msgid="1756857139634224222">"लेख संदेश"</string>
<string name="postal_address" msgid="8765560217149624536">"पता"</string>
<string name="ghostData_company" msgid="5414421120553765775">"कंपनी"</string>
@@ -355,9 +355,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>
@@ -371,11 +371,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">"SIM कार्ड"</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">
@@ -399,10 +399,10 @@
<string name="missing_required_permission" msgid="5865884842972833120">"आपने एक आवश्यक अनुमति को अक्षम कर दिया है."</string>
<string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"निर्यात करते समय कोई गड़बड़ी आई: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<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_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_fallback" msgid="6060472638008218274">"संपर्कों का निर्यात किया जाना खत्म हो गया."</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>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"<xliff:g id="FILENAME">%s</xliff:g> को निर्यात करना रद्द किया गया."</string>
@@ -419,9 +419,9 @@
<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>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"vCard आयात अनुरोध अस्वीकार हो गया था. बाद में फिर से प्रयास करें."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"vCard आयात अनुरोध अस्वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
<string name="contacts_export_will_start_message" msgid="8538705791417534431">"संपर्कों को शीघ्र ही निर्यात किया जाएगा."</string>
- <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard आयात अनुरोध अस्वीकार हो गया था. बाद में फिर से प्रयास करें."</string>
+ <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard आयात अनुरोध अस्वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"संपर्क"</string>
<string name="caching_vcard_message" msgid="4926308675041506756">"vCard को स्थानीय अस्थायी मेमोरी में संचित कर रहा है. वास्तविक आयात जल्दी ही प्रारंभ होगा."</string>
<string name="vcard_import_failed" msgid="5223531255894842406">"vCard आयात नहीं कर सका."</string>
@@ -453,14 +453,14 @@
<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>
<string name="menu_export" msgid="2658783911863503902">"संपर्क भेजें"</string>
<string name="menu_blocked_numbers" msgid="5272951629083025995">"ब्लॉक किए गए नंबर"</string>
- <string name="contact_status_update_attribution" msgid="752179367353018597">"<xliff:g id="SOURCE">%1$s</xliff:g> से"</string>
- <string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="SOURCE">%2$s</xliff:g> से <xliff:g id="DATE">%1$s</xliff:g>"</string>
+ <string name="contact_status_update_attribution" msgid="752179367353018597">"<xliff:g id="SOURCE">%1$s</xliff:g> द्वारा"</string>
+ <string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="SOURCE">%2$s</xliff:g> द्वारा <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="action_menu_back_from_search" msgid="8793348588949233348">"खोजना बंद करें"</string>
<string name="description_clear_search" msgid="688023606766232904">"खोज साफ़ करें"</string>
<string name="select_account_dialog_title" msgid="5478489655696599219">"खाता"</string>
@@ -495,11 +495,11 @@
<string name="sim_import_failed_toast" msgid="5559267299793622705">"सिम संपर्कों को आयात करने में विफल रहा"</string>
<string name="sim_import_title" msgid="2511154832820812822">"सिम से आयात करें"</string>
<string name="sim_import_cancel_content_description" msgid="1619832410253424452">"रद्द करें"</string>
- <string name="auto_sync_off" msgid="2180147284456026587">"अपने आप समन्वयन बंद है. चालू करने के लिए टैप करें."</string>
+ <string name="auto_sync_off" msgid="2180147284456026587">"स्वतः समन्वयन बंद है. चालू करने के लिए टैप करें."</string>
<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">"Google संपर्क सहित सभी ऐप्लिकेशन और खातों में किए जाने वाले आपके बदलाव, वेब और आपके डिवाइस के बीच अप-टू-डेट रखे जाएंगे."</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"आपके द्वारा न केवल Google संपर्क में, बल्कि सभी ऐप्लिकेशन और खातों में किए जाने वाले बदलाव, वेब और आपके डिवाइस के बीच अप-टू-डेट रखे जाएंगे."</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-ja/donottranslate_config.xml b/res/values-ja/donottranslate_config.xml
index ff8a8eb..b357856 100644
--- a/res/values-ja/donottranslate_config.xml
+++ b/res/values-ja/donottranslate_config.xml
@@ -32,7 +32,4 @@
<!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
<bool name="config_editor_field_order_primary">false</bool>
-
- <!-- If true, phonetic name is included in the contact editor by default -->
- <bool name="config_editor_include_phonetic_name">true</bool>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index df3cf7f..431448e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -95,7 +95,7 @@
<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="photoPickerNotFoundText" msgid="2052542573853433204">"使用できる写真がデバイス上にありません。"</string>
+ <string name="photoPickerNotFoundText" msgid="2052542573853433204">"使用できる写真が端末上にありません。"</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"連絡先の写真"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"カスタムラベル名"</string>
<string name="removePhoto" msgid="4898105274130284565">"写真を削除"</string>
@@ -301,7 +301,7 @@
<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="account_phone" msgid="7128032778471187553">"デバイス"</string>
+ <string name="account_phone" msgid="7128032778471187553">"端末"</string>
<string name="account_sim" msgid="6519016427905087952">"SIM"</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"名前"</string>
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"ニックネーム"</string>
@@ -499,7 +499,7 @@
<string name="dismiss_sync_alert" msgid="8941131776605093596">"閉じる"</string>
<string name="account_sync_off" msgid="7646143254066243924">"アカウントの同期が OFF になっています。タップすると ON になります。"</string>
<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"自動同期を ON にしますか？"</string>
- <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Google コンタクトだけでなく、あらゆるアプリとアカウントに変更を加えるたびに、ウェブとご利用のデバイス間で同期されるようになります。"</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Google コンタクトだけでなく、あらゆるアプリとアカウントに変更を加えるたびに、ウェブとご利用の端末間で同期されるようになります。"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"ON にする"</string>
<string name="connection_error_message" msgid="7046408921529247089">"ネットワークに接続されていません"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9d47b2a..1022b1c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -471,11 +471,11 @@
<string name="call_subject_limit" msgid="4545212901205397669">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
<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" 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="activity_title_licenses" msgid="5467767062737708066">"Ашық кодты бағдарлама лицензиялары"</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>
<string name="account_filter_view_not_checked" msgid="2248684521205038389">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> белгіленбеген"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 9ec0672..24d7493 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -133,12 +133,12 @@
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"ଫୋନ୍ ନମ୍ବର୍ ଯୋଡ଼ନ୍ତୁ"</string>
<string name="quickcontact_add_email" msgid="739298028384348482">"ଇମେଲ୍ ଯୋଡ଼ନ୍ତୁ"</string>
<string name="missing_app" msgid="1466111003546611387">"ଏହି କାର୍ଯ୍ୟକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ କୌଣସି ଆପ୍ ମିଳିଲା ନାହିଁ"</string>
- <string name="menu_share" msgid="943789700636542260">"ସେୟାର୍ କରନ୍ତୁ"</string>
+ <string name="menu_share" msgid="943789700636542260">"ଶେୟାର୍ କରନ୍ତୁ"</string>
<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="other">ମାଧ୍ୟମରେ ଯୋଗାଯୋଗ ସେୟାର୍ କରନ୍ତୁ</item>
- <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>
@@ -215,7 +215,7 @@
<string name="header_name_entry" msgid="1592791008096288306">"ନାମ"</string>
<string name="header_email_entry" msgid="8666093061171624478">"ଇମେଲ୍"</string>
<string name="header_phone_entry" msgid="8450980572274173570">"ଫୋନ୍"</string>
- <string name="content_description_directions" msgid="2686791825798189335">"ଲୋକେସନ୍ ପାଇଁ ଦିଗନିର୍ଦ୍ଦେଶ"</string>
+ <string name="content_description_directions" msgid="2686791825798189335">"ଲୋକେଶନ୍ ପାଇଁ ଦିଗନିର୍ଦ୍ଦେଶ"</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>
@@ -403,8 +403,8 @@
<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_fallback" msgid="6060472638008218274">"ଯୋଗାଯୋଗଗୁଡ଼ିକର ଏକ୍ସପୋର୍ଟ ଶେଷ ହୋଇଛି।"</string>
- <string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"ଯୋଗାଯୋଗ ଏକ୍ସପୋର୍ଟ ଶେଷ ହୋଇଛି, ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ସେୟାର୍ କରିବାକୁ ବିଜ୍ଞପ୍ତି କ୍ଲିକ୍ କରନ୍ତୁ।"</string>
- <string name="touch_to_share_contacts" msgid="4882485525268469736">"ଯୋଗାଯୋଗୁଡ଼ିକୁ ସେୟାର୍ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
+ <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>
@@ -443,13 +443,13 @@
<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_contacts" msgid="8109287987498711664">"ସମସ୍ତ ଯୋଗାଯୋଗ ସେୟାର୍ କରନ୍ତୁ"</string>
- <string name="share_contacts_failure" msgid="1216431977330560559">"ଯୋଗଯୋଗ ସେୟାର୍ କରିହେଲା ନାହିଁ"</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>
<string name="dialog_import" msgid="2423592905927819672">"ଏଠାରୁ ଯୋଗାଯୋଗ ଇମ୍ପୋର୍ଟ କରନ୍ତୁ"</string>
- <string name="share_error" msgid="948429331673358107">"ଏହି ଯୋଗାଯୋଗ ସେୟାର୍ କରିହେବ ନାହିଁ।"</string>
- <string name="no_contact_to_share" msgid="1276397530378323033">"ସେୟାର୍ କରିବା ପାଇଁ କୌଣସି ଯୋଗାଯୋଗ ନାହାନ୍ତି"</string>
+ <string name="share_error" msgid="948429331673358107">"ଏହି ଯୋଗାଯୋଗ ଶେୟାର୍ କରିହେବ ନାହିଁ।"</string>
+ <string name="no_contact_to_share" msgid="1276397530378323033">"ଶେୟାର୍ କରିବା ପାଇଁ କୌଣସି ଯୋଗାଯୋଗ ନାହାନ୍ତି"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"ଡିସ୍ପ୍ଲେ ପାଇଁ ଯୋଗାଯୋଗ"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"ଡିସ୍ପ୍ଲେ କରିବା ପାଇଁ ଯୋଗାଯୋଗ"</string>
<string name="custom_list_filter" msgid="9048525797111024204">"ଦୃଶ୍ୟ କୁ ଷ୍ଟମାଇଜ୍ କରନ୍ତୁ"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 817b563..f73cfb0 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -156,8 +156,8 @@
<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>
- <string name="cancel_button_content_description" msgid="1288652456274531846">"ரத்துசெய்யும் பட்டன்"</string>
- <string name="back_arrow_content_description" msgid="4355362760545735065">"முந்தையதற்குச் செல்லும் பட்டன்"</string>
+ <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="contact_directory_description" msgid="683398073603909119">"கோப்பகம் <xliff:g id="TYPE">%1$s</xliff:g>"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index bddd106..34129bf 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -131,7 +131,7 @@
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktlaringiz ismi"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Avvalgi ekranga qaytish uchun bosing"</string>
<string name="quickcontact_add_phone_number" msgid="731665835910658965">"Telefon raqamini kiritish"</string>
- <string name="quickcontact_add_email" msgid="739298028384348482">"Email manzilini kiritish"</string>
+ <string name="quickcontact_add_email" msgid="739298028384348482">"E-pochta manzilini kiritish"</string>
<string name="missing_app" msgid="1466111003546611387">"Ushbu amalni bajarish uchun ilova topilmadi."</string>
<string name="menu_share" msgid="943789700636542260">"Yuborish"</string>
<string name="menu_add_contact" msgid="3198704337220892684">"Kontaktlarga saqlash"</string>
@@ -213,7 +213,7 @@
<string name="header_event_entry" msgid="6738250422744401460">"Tadbir"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Aloqadorligi"</string>
<string name="header_name_entry" msgid="1592791008096288306">"Ism"</string>
- <string name="header_email_entry" msgid="8666093061171624478">"Email"</string>
+ <string name="header_email_entry" msgid="8666093061171624478">"E-pochta"</string>
<string name="header_phone_entry" msgid="8450980572274173570">"Telefon"</string>
<string name="content_description_directions" msgid="2686791825798189335">"manzilga yo\'nalishlar"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Boshqa maydonlar"</string>
@@ -286,7 +286,7 @@
<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
<string name="description_video_call" msgid="7120921378651700947">"Video qo‘ng‘iroq qilish"</string>
<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"Bu ro‘yxat tozalansinmi?"</string>
- <string name="clearFrequentsConfirmation" msgid="2270554975938265734">"Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi. Email ilovalari esa e-pochta manzillarini yangidan eslay boshlaydi."</string>
+ <string name="clearFrequentsConfirmation" msgid="2270554975938265734">"Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi. E-pochta ilovalari esa e-pochta manzillarini yangidan eslay boshlaydi."</string>
<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"Ro‘yxat tozalanmoqda…"</string>
<string name="status_available" msgid="5586870015822828392">"Aloqada"</string>
<string name="status_away" msgid="1838861100379804730">"Tashqarida"</string>
@@ -315,7 +315,7 @@
<string name="name_phonetic_middle" msgid="8643721493320405200">"Otasining ismi talaffuzi"</string>
<string name="name_phonetic_family" msgid="2640133663656011626">"Familiya talaffuzi"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefon"</string>
- <string name="emailLabelsGroup" msgid="8389931313045344406">"Email"</string>
+ <string name="emailLabelsGroup" msgid="8389931313045344406">"E-pochta"</string>
<string name="postalLabelsGroup" msgid="3487738141112589324">"Manzil"</string>
<string name="imLabelsGroup" msgid="3898238486262614027">"Chat"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Tashkilot"</string>
@@ -333,9 +333,9 @@
<string name="email_home" msgid="8573740658148184279">"Shaxsiy e-pochta"</string>
<string name="email_mobile" msgid="2042889209787989814">"Mobil e-pochta"</string>
<string name="email_work" msgid="2807430017302722689">"Ish e-pochtasi"</string>
- <string name="email_other" msgid="3454004077967657109">"Email xat yuborish"</string>
- <string name="email_custom" msgid="5536404237099078802">"Email xat yozish (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>
- <string name="email" msgid="5668400997660065897">"Email"</string>
+ <string name="email_other" msgid="3454004077967657109">"E-pochta xat yuborish"</string>
+ <string name="email_custom" msgid="5536404237099078802">"E-pochta xat yozish (<xliff:g id="CUSTOM_LABEL">%s</xliff:g>)"</string>
+ <string name="email" msgid="5668400997660065897">"E-pochta"</string>
<string name="postal_street" msgid="8133143961580058972">"Ko‘cha"</string>
<string name="postal_city" msgid="6597491300084895548">"Shahar"</string>
<string name="postal_region" msgid="6045263193478437672">"Viloyat"</string>
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index 6042939..cee1b1a 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -55,6 +55,7 @@
import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.Arrays;
@@ -477,7 +478,7 @@
simLoadResult.accounts = accounts;
return simLoadResult;
}
- });
+ }, MoreExecutors.directExecutor());
}
private LoaderResult loadFromSim() {
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index f67f074..34f9cb2 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -59,6 +59,7 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.Collections;
@@ -503,7 +504,8 @@
private synchronized void reloadAccountTypes() {
loadAccountTypes();
Futures.addCallback(
- Futures.transform(mAccountTypesFuture, mAccountsExtractor),
+ Futures.transform(mAccountTypesFuture, mAccountsExtractor,
+ MoreExecutors.directExecutor()),
newAccountsUpdatedCallback(mAccountManagerAccounts),
mMainThreadExecutor);
}
@@ -534,7 +536,8 @@
final ListenableFuture<List<List<AccountWithDataSet>>> all =
Futures.nonCancellationPropagating(
Futures.successfulAsList(
- Futures.transform(mAccountTypesFuture, mAccountsExtractor),
+ Futures.transform(mAccountTypesFuture, mAccountsExtractor,
+ MoreExecutors.directExecutor()),
mLocalAccountsFuture));
return Futures.transform(all, new Function<List<List<AccountWithDataSet>>,
@@ -560,7 +563,7 @@
AccountInfo.sortAccounts(null, result);
return result;
}
- });
+ }, MoreExecutors.directExecutor());
}
@Override
diff --git a/src/com/android/contacts/util/concurrent/FuturesUtil.java b/src/com/android/contacts/util/concurrent/FuturesUtil.java
index 113af93..ba72446 100644
--- a/src/com/android/contacts/util/concurrent/FuturesUtil.java
+++ b/src/com/android/contacts/util/concurrent/FuturesUtil.java
@@ -3,9 +3,10 @@
import android.os.Handler;
-import com.google.common.util.concurrent.FutureFallback;
+import com.google.common.util.concurrent.AsyncFunction;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ScheduledExecutorService;
@@ -46,14 +47,14 @@
}
}, time, unit);
- return Futures.withFallback(future, new FutureFallback<V>() {
+ return Futures.catchingAsync(future, Throwable.class, new AsyncFunction<Throwable, V>() {
@Override
- public ListenableFuture<V> create(Throwable t) throws Exception {
+ public ListenableFuture<V> apply(Throwable t) throws Exception {
if ((t instanceof CancellationException) && didTimeout.get()) {
return Futures.immediateFailedFuture(new TimeoutException("Timeout expired"));
}
return Futures.immediateFailedFuture(t);
}
- });
+ }, MoreExecutors.directExecutor());
}
}