Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0914fcf1 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r2' into cm-14.1 

Android 7.1.2 Release 2 (N2G47E)

# gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents d17c7176 15922c5a

res/values-ar/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
    <string name="attach_photo_dialog_title" msgid="5599827035558557169">"صورة جهة الاتصال"</string>

    <string name="customLabelPickerTitle" msgid="1081475101983255212">"اسم تصنيف مخصص"</string>

    <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"إرسال المكالمات إلى البريد الصوتي مباشرة"</string>

    <string name="removePhoto" msgid="4898105274130284565">"إزالة الصور"</string>

    <string name="removePhoto" msgid="4898105274130284565">"إزالة الصورة"</string>

    <string name="noContacts" msgid="4955659076981974652">"ليست هناك جهات اتصال"</string>

    <string name="noGroups" msgid="8614664663561385253">"لا توجد مجموعات."</string>

    <string name="noAccounts" msgid="7768267764545265909">"يجب توفير حساب لإنشاء مجموعات."</string>
@@ -208,7 +208,7 @@ 
    <string name="list_filter_custom" msgid="8910173055702057002">"مخصص"</string>

    <string name="activity_title_settings" msgid="5464130076132770781">"الإعدادات"</string>

    <string name="menu_settings" msgid="377929915873428211">"الإعدادات"</string>

    <string name="menu_help" msgid="1680178646764069976">"المساعدة والتعليقات"</string>

    <string name="menu_help" msgid="1680178646764069976">"مساعدة وتعليقات"</string>

    <string name="preference_displayOptions" msgid="1341720270148252393">"خيارات العرض"</string>

    <string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>، <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>

    <string name="non_phone_caption" msgid="1541655052330027380">"رقم الهاتف"</string>
@@ -222,7 +222,7 @@ 
    <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"إنشاء جهة اتصال جديدة"</string>

    <string name="contacts_unavailable_add_account" msgid="4347232421410561500">"إضافة حساب"</string>

    <string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"استيراد جهات الاتصال"</string>

    <string name="create_group_dialog_title" msgid="6874527142828424475">"إنشاء مجموعة جديدة"</string>

    <string name="create_group_dialog_title" msgid="6874527142828424475">"إنشاء تصنيف جديد"</string>

    <string name="create_group_item_label" msgid="4411981763169654825">"إنشاء مجموعة جديدة"</string>

    <plurals name="num_groups_in_account" formatted="false" msgid="6189297639209663469">

      <item quantity="zero"><xliff:g id="COUNT">%0$d</xliff:g> مجموعات</item>

res/values-b+sr+Latn/strings.xml

+8 −8
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <string name="shortcutMessageContact" msgid="2460337253595976198">"Direktna poruka"</string>

    <string name="shortcutActivityTitle" msgid="6642877210643565436">"Odaberite prečicu za kontakt"</string>

    <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Odaberite broj za poziv"</string>

    <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Odaberite broj za slanje poruka"</string>

    <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Odaberite broj za SMS"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Dodajte kontaktu"</string>

    <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Izaberite kontakt"</string>

    <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Napravi novi kontakt"</string>
@@ -106,7 +106,7 @@ 
    <string name="attach_photo_dialog_title" msgid="5599827035558557169">"Slika kontakta"</string>

    <string name="customLabelPickerTitle" msgid="1081475101983255212">"Naziv prilagođene oznake"</string>

    <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Šalji pozive direktno u glasovnu poštu"</string>

    <string name="removePhoto" msgid="4898105274130284565">"Ukloni fotografiju"</string>

    <string name="removePhoto" msgid="4898105274130284565">"Ukloni sliku"</string>

    <string name="noContacts" msgid="4955659076981974652">"Nema kontakata"</string>

    <string name="noGroups" msgid="8614664663561385253">"Nema grupa."</string>

    <string name="noAccounts" msgid="7768267764545265909">"Morate da imate nalog da biste mogli da pravite grupe."</string>
@@ -145,7 +145,7 @@ 
    <string name="callAgain" msgid="3197312117049874778">"Pozovi ponovo"</string>

    <string name="returnCall" msgid="8171961914203617813">"Uzvrati poziv"</string>

    <string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Želite li da dodate imejl adresu „<xliff:g id="EMAIL">%s</xliff:g>“ u kontakte?"</string>

    <string name="description_contact_photo" msgid="3387458082667894062">"fotografija kontakta"</string>

    <string name="description_contact_photo" msgid="3387458082667894062">"slika kontakta"</string>

    <string name="description_plus_button" msgid="515164827856229880">"plus"</string>

    <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> od <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontak(a)ta"</string>

    <string name="search_settings_description" msgid="2675223022992445813">"Imena kontakata"</string>
@@ -170,10 +170,10 @@ 
    <skip />

    <string name="contact_read_only" msgid="7421346527289472273">"Ne može da se izmeni iz ove aplikacije."</string>

    <string name="group_read_only" msgid="1061762906115697637">"Ne može da se menja na ovom uređaju."</string>

    <string name="take_photo" msgid="7496128293167402354">"Snimi fotografiju"</string>

    <string name="take_new_photo" msgid="7341354729436576304">"Napravi novu fotografiju"</string>

    <string name="take_photo" msgid="7496128293167402354">"Slikaj"</string>

    <string name="take_new_photo" msgid="7341354729436576304">"Slikaj novu sliku"</string>

    <string name="pick_photo" msgid="2129509985223564942">"Izaberi sliku"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"Izaberite novu sliku"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"Izaberi novu sliku"</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"Kontakt lista se ažurira."</string>

    <string name="search_results_searching" msgid="3984833028938569930">"Pretražuje se..."</string>

    <string name="menu_display_selected" msgid="6470001164297969034">"Prikaži izabrano"</string>
@@ -187,7 +187,7 @@ 
    <string name="change_photo" msgid="8530597935483526383">"Promeni"</string>

    <string name="primary_photo" msgid="8517942231868516999">"Glavna slika"</string>

    <string name="description_star" msgid="2605854427360036550">"omiljeno"</string>

    <string name="edit_contact" msgid="7529281274005689512">"Izmeni kontakt"</string>

    <string name="edit_contact" msgid="7529281274005689512">"Izmenite kontakt"</string>

    <string name="aggregation_suggestion_join_dialog_message" msgid="6786192560870357912">"Želite li da aktuelni kontakt objedinite sa izabranim kontaktom?"</string>

    <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Želite li da prebacite na uređivanje izabranog kontakta? Biće kopirane informacije koje ste uneli do sada."</string>

    <string name="menu_copyContact" msgid="1573960845106822639">"Kopiraj u moje kontakte"</string>
@@ -249,7 +249,7 @@ 
    <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Novi kontakti će biti sačuvani na nalogu <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>

    <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite podrazumevani nalog za nove kontakte:"</string>

    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj novi kontakt"</string>

    <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Izmeni kontakt"</string>

    <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Izmenite kontakt"</string>

    <string name="keep_local" msgid="1258761699192993322">"Zadrži lokalno"</string>

    <string name="add_account" msgid="8201790677994503186">"Dodaj nalog"</string>

    <string name="add_new_account" msgid="5748627740680940264">"Dodaj novi nalog"</string>

res/values-be-rBY/strings.xml

+11 −11
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
    <string name="contactsList" msgid="8661624236494819731">"Кантакты"</string>

    <string name="shortcutContact" msgid="749243779392912958">"Кантакт"</string>

    <string name="shortcutDialContact" msgid="746622101599186779">"Хуткі выклік"</string>

    <string name="shortcutMessageContact" msgid="2460337253595976198">"Прамое паведамленне"</string>

    <string name="shortcutActivityTitle" msgid="6642877210643565436">"Выберыце кантакт для хуткага доступу"</string>

    <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Выберыце нумар для выкліку"</string>

    <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Выберыце нумар для адпраўкi паведамлення"</string>

    <string name="shortcutMessageContact" msgid="2460337253595976198">"Хуткае паведамл."</string>

    <string name="shortcutActivityTitle" msgid="6642877210643565436">"Выберыце кантакт"</string>

    <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Выберыце нумар"</string>

    <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Выберыце нумар"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Дадаць у кантакт"</string>

    <string name="contactPickerActivityTitle" msgid="4301062192337417640">"Выберыце кантакт"</string>

    <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Стварыць новы кантакт"</string>
@@ -58,7 +58,7 @@ 
    <string name="menu_new_contact_action_bar" msgid="7263362129442119188">"Дадаць кантакт"</string>

    <string name="menu_new_group_action_bar" msgid="3520232877587377175">"Дадаць групу"</string>

    <string name="splitConfirmation" msgid="7342030840130187290">"Раз\'яднаць гэты кантакт на некалькі кантактаў?"</string>

    <string name="splitConfirmation_positive_button" msgid="9129409098807939699">"Выдаліць сувязь"</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="joinConfirmation" msgid="8262614843581924365">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і спасылку на выбраны кантакт?"</string>
@@ -115,7 +115,7 @@ 
    <string name="addPeopleToGroup" msgid="7879585947222263516">"Каб дадаць, змянiце групу."</string>

    <string name="savingContact" msgid="4075751076741924939">"Захаванне кантакту..."</string>

    <string name="contactSavedToast" msgid="9171862279493213075">"Кантакт захаваны"</string>

    <string name="contactUnlinkedToast" msgid="7122823195786012553">"Кантакты адлучаны"</string>

    <string name="contactUnlinkedToast" msgid="7122823195786012553">"Кантакты раз\'яднаны"</string>

    <string name="contactSavedErrorToast" msgid="3207250533172944892">"Немагчыма захаваць змены кантакта."</string>

    <string name="contactUnlinkErrorToast" msgid="2758070702785994171">"Не ўдалося скасаваць сувязь з кантактам."</string>

    <string name="contactJoinErrorToast" msgid="3977932531264809035">"Не ўдалося падлучыць кантакт."</string>
@@ -158,9 +158,9 @@ 
    <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="share_via" msgid="563121028023030093">"Апублікаваць кантакт з дапамогай"</string>

    <string name="share_via" msgid="563121028023030093">"Абагуліць кантакт з дапамогай"</string>

    <string name="dialog_new_group_account" msgid="2318032089273496830">"Стварыць групу ва ўліковым запісе"</string>

    <string name="audio_chat" msgid="2535716629358298691">"Галасавы чат"</string>

    <string name="video_chat" msgid="1872255818640336072">"Відэачат"</string>
@@ -175,7 +175,7 @@ 
    <string name="contact_read_only" msgid="7421346527289472273">"Не рэдагуецца гэтым прыкладаннем."</string>

    <string name="group_read_only" msgid="1061762906115697637">"Нельга рэдагаваць на гэтай прыладзе."</string>

    <string name="take_photo" msgid="7496128293167402354">"Зрабіць фота"</string>

    <string name="take_new_photo" msgid="7341354729436576304">"Зрабiце новую фатаграфію"</string>

    <string name="take_new_photo" msgid="7341354729436576304">"Зрабiць новую фатаграфію"</string>

    <string name="pick_photo" msgid="2129509985223564942">"Выбраць фота"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"Выбраць новае фота"</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"Спiс кантактаў абнаўляецца."</string>
@@ -255,7 +255,7 @@ 
    <string name="contact_editor_prompt_zero_accounts" msgid="1785345895691886499">"Рэзервовая копiя вашага новага кантакту не будзе створана. Дадаць улiковы запiс, у якiм будуць захоўвацца рэзервовыя копii кантактаў у Iнтэрнэце?"</string>

    <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Новыя кантакты будуць захаваны ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>

    <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Выбраць уліковы запіс па змаўчанні для новых кантактаў:"</string>

    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Дадаць новы кантакт"</string>

    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Новы кантакт"</string>

    <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Рэдагаваць кантакт"</string>

    <string name="keep_local" msgid="1258761699192993322">"Захоўваць лакальна"</string>

    <string name="add_account" msgid="8201790677994503186">"Дадаць уліковы запіс"</string>
@@ -324,7 +324,7 @@ 
      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> звязаны кантакт</item>

      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> звязаныя кантакты</item>

      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> звязаных кантактаў</item>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> звязанага кантакта</item>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> звязанага кантакту</item>

    </plurals>

    <plurals name="quickcontact_suggestion_account_type_number" formatted="false" msgid="3001681298924002373">

      <item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>

res/values-bn-rBD/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <string name="shortcutContact" msgid="749243779392912958">"পরিচিতি"</string>

    <string name="shortcutDialContact" msgid="746622101599186779">"সরাসরি ডায়াল"</string>

    <string name="shortcutMessageContact" msgid="2460337253595976198">"সরাসরি বার্তা"</string>

    <string name="shortcutActivityTitle" msgid="6642877210643565436">"শর্টকার্ট করতে একটি পরিচিতি বেছে নিন"</string>

    <string name="shortcutActivityTitle" msgid="6642877210643565436">"একটি পরিচিতি শর্টকার্ট বাছুন"</string>

    <string name="callShortcutActivityTitle" msgid="6065749861423648991">"কল করার জন্য একটি নম্বর বেছে নিন"</string>

    <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"বার্তা পাঠানোর জন্য একটি নম্বর বেছে নিন"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"পরিচিতিতে যোগ করুন"</string>
@@ -299,8 +299,8 @@ 
    <string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"পরিচিতি লিঙ্ক করুন"</string>

    <string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"বাতিল করুন"</string>

    <plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">

      <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"><xliff:g id="COUNT">%d</xliff:g>টি সম্ভাব্য ডুপ্লিকেট</item>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>টি সম্ভাব্য ডুপ্লিকেট</item>

    </plurals>

    <plurals name="quickcontact_suggestions_number" formatted="false" msgid="495992931510695330">

      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি লিঙ্ক করা পরিচিতি</item>

res/values-bs-rBA/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ 
    <string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Dodaj u kontakt"</string>

    <string name="non_phone_close" msgid="7608506439725515667">"Zatvori"</string>

    <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>

    <string name="date_year_toggle" msgid="7122002148518724139">"Uključi godine"</string>

    <string name="date_year_toggle" msgid="7122002148518724139">"Prikaži godinu"</string>

    <string name="social_widget_label" msgid="6378905543028924592">"Kontakt"</string>

    <string name="social_widget_loading" msgid="5327336597364074608">"Učitavanje…"</string>

    <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Napravi novi kontakt"</string>
@@ -274,7 +274,7 @@ 
    <string name="header_organization_entry" msgid="8515394955666265406">"Organizacija"</string>

    <string name="header_nickname_entry" msgid="6743561883967451485">"Nadimak"</string>

    <string name="header_note_entry" msgid="4320190426480612344">"Bilješka"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"Web stranica"</string>

    <string name="header_website_entry" msgid="1411467850000824745">"Web lokacija"</string>

    <string name="header_event_entry" msgid="6738250422744401460">"Događaj"</string>

    <string name="header_relation_entry" msgid="1520292958088146460">"Odnos"</string>

    <string name="header_account_entry" msgid="2684318506427891827">"Račun"</string>