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

Commit 7099d766 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)

Change-Id: I7d921a147376e4c7b065c538023e4d9a43cbbdb2
parents 1d870ae0 ad18dc9e

res/values-bs-rBA/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -52,18 +52,18 @@ 
    <string name="blocked_numbers" msgid="2751843139572970579">"Blokirani brojevi"</string>

    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Nećete primati pozive i poruke od blokiranih brojeva."</string>

    <string name="block_number" msgid="1101252256321306179">"Dodaj broj"</string>

    <string name="unblock_dialog_body" msgid="1614238499771862793">"Odblokirati <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>

    <string name="unblock_button" msgid="3078048901972674170">"Odblokiraj"</string>

    <string name="unblock_dialog_body" msgid="1614238499771862793">"Deblokirati <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>

    <string name="unblock_button" msgid="3078048901972674170">"Deblokiraj"</string>

    <string name="add_blocked_dialog_body" msgid="9030243212265516828">"Blokiraj pozive i tekstualne poruke od"</string>

    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Telefonski broj"</string>

    <string name="add_blocked_number_hint" msgid="6847675097085433553">"Broj telefona"</string>

    <string name="block_button" msgid="8822290682524373357">"Blokiraj"</string>

    <string name="non_primary_user" msgid="5180129233352533459">"Samo vlasnik uređaja može pregledati i upravljati blokiranim brojevima."</string>

    <string name="delete_icon_description" msgid="8903995728252556724">"Odblokiraj"</string>

    <string name="delete_icon_description" msgid="8903995728252556724">"Deblokiraj"</string>

    <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"Blokiranje je privremeno isključeno"</string>

    <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"Nakon što pozovete ili pošaljete poruku na broj za hitne slučajeve, blokiranje se isključuje da bi vas hitna služba mogla kontaktirati."</string>

    <string name="blocked_numbers_butter_bar_button" msgid="2197943354922010696">"Ponovo omogući sada"</string>

    <string name="blocked_numbers_number_blocked_message" msgid="7678509606805029540">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> je blokiran"</string>

    <string name="blocked_numbers_number_unblocked_message" msgid="977894647366750418">"<xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g> je odblokiran"</string>

    <string name="blocked_numbers_number_unblocked_message" msgid="977894647366750418">"<xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g> je deblokiran"</string>

    <string name="blocked_numbers_block_emergency_number_message" msgid="917851876780698387">"Nije moguće blokirati broj za hitne slučajeve."</string>

    <string name="blocked_numbers_number_already_blocked_message" msgid="4392247814500811798">"<xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g> je već blokiran."</string>

    <string name="toast_personal_call_msg" msgid="5115361633476779723">"Za upućivanje poziva koristi se lična brojčana tastatura"</string>

res/values-eu-rES/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <string name="telecommAppLabel" product="default" msgid="382363169988504520">"Deien kudeaketa"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Telefonoa"</string>

    <string name="unknown" msgid="6878797917991465859">"Ezezaguna"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Dei galdua"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Galdutako deia"</string>

    <string name="notification_missedWorkCallTitle" msgid="6242489980390803090">"Laneko dei bat galdu duzu"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Dei galduak"</string>

    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> dei galdu"</string>

res/values-hi/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
    <string name="block_number" msgid="1101252256321306179">"एक नंबर जोड़ें"</string>

    <string name="unblock_dialog_body" msgid="1614238499771862793">"<xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> को अनवरोधित करें?"</string>

    <string name="unblock_button" msgid="3078048901972674170">"अनवरोधित करें"</string>

    <string name="add_blocked_dialog_body" msgid="9030243212265516828">"इसके कॉल और लेख को अवरुद्ध करें"</string>

    <string name="add_blocked_dialog_body" msgid="9030243212265516828">"इसके कॉल और लेख अवरुद्ध करें"</string>

    <string name="add_blocked_number_hint" msgid="6847675097085433553">"फ़ोन नंबर"</string>

    <string name="block_button" msgid="8822290682524373357">"अवरुद्ध करें"</string>

    <string name="non_primary_user" msgid="5180129233352533459">"केवल डिवाइस स्वामी अवरुद्ध किए गए नंबर देख और प्रबंधित कर सकते हैं."</string>

res/values-hy-rAM/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
    <string name="change_default_dialer_dialog_negative" msgid="9078144617060173845">"Չեղարկել"</string>

    <string name="change_default_dialer_warning_message" msgid="1417671460801684999">"<xliff:g id="NEW_APP">%s</xliff:g> հավելվածը կկատարի զանգերի հետ կապված բոլոր գործառույթները: Որպես Հեռախոսի կանխադրված հավելված նշեք միայն վստահելի հավելվածներ:"</string>

    <string name="blocked_numbers" msgid="2751843139572970579">"Արգելափակված համարներ"</string>

    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Արգելափակված համարներից զանգեր կամ SMS–ներ չեք ստանա:"</string>

    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Արգելափակված համարներից զանգեր և SMS-ներ չեք ստանա:"</string>

    <string name="block_number" msgid="1101252256321306179">"Ավելացնել համար"</string>

    <string name="unblock_dialog_body" msgid="1614238499771862793">"Արգելաբացե՞լ <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g> համարը:"</string>

    <string name="unblock_button" msgid="3078048901972674170">"Արգելաբացել"</string>

res/values-it/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
    <string name="telecommAppLabel" product="default" msgid="382363169988504520">"Gestione chiamate"</string>

    <string name="userCallActivityLabel" product="default" msgid="5415173590855187131">"Telefono"</string>

    <string name="unknown" msgid="6878797917991465859">"Sconosciuto"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chiamata senza risposta"</string>

    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chiamata persa"</string>

    <string name="notification_missedWorkCallTitle" msgid="6242489980390803090">"Chiamata di lavoro persa"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate senza risposta"</string>

    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chiamate senza risposta"</string>

    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate perse"</string>

    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chiamate perse"</string>

    <string name="notification_missedCallTicker" msgid="504686252427747209">"Chiamata senza risposta da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>

    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Richiama"</string>

    <string name="notification_missedCall_message" msgid="3049928912736917988">"Messaggio"</string>