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

Commit c28fe06b 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 38030852 4095f560

InCallUI/res/values-be-rBY/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <string name="confCall" msgid="3181961445236675173">"Канферэнц-выклік"</string>

    <string name="call_lost" msgid="8208184291640961172">"Выклік абарваўся"</string>

    <string name="audio_mode_speaker" msgid="6160127758732918123">"Дынамік"</string>

    <string name="audio_mode_earpiece" msgid="3138677187223932893">"Навушнік гарнітуры"</string>

    <string name="audio_mode_earpiece" msgid="3138677187223932893">"Дынамік тэлефона"</string>

    <string name="audio_mode_wired_headset" msgid="583080366967943196">"Правадная гарнітура"</string>

    <string name="audio_mode_bluetooth" msgid="3188504589946495676">"Bluetooth"</string>

    <string name="wait_prompt_str" msgid="3784275777844586675">"Адправіць гэтыя тоны?\n"</string>

InCallUI/res/values-bn-rBD/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
    <string name="description_target_accept_upgrade_to_video_receive_request" msgid="2224978927364021080">"ভিডিও গ্রহণ করার অনুরোধ স্বীকার করুন"</string>

    <string name="description_target_decline_upgrade_to_video_receive_request" msgid="3151115394424918077">"ভিডিও গ্রহণ করার অনুরোধ প্রত্যাখ্যান করুন"</string>

    <string name="description_direction_up" msgid="1735018141439291766">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য উপরের দিকে স্লাইড করুন৷"</string>

    <string name="description_direction_left" msgid="6811598791620851239">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য বাম দিকে স্লাইড করুন৷"</string>

    <string name="description_direction_left" msgid="6811598791620851239">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য বাঁ দিকে স্লাইড করুন৷"</string>

    <string name="description_direction_right" msgid="5461971399586296023">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য ডান দিকে স্লাইড করুন৷"</string>

    <string name="description_direction_down" msgid="3331715227997561639">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> এর জন্য নীচের দিকে স্লাইড করুন৷"</string>

    <string name="voicemail_notification_vibrate_when_title" msgid="4595145399183729630">"কম্পন"</string>

InCallUI/res/values-da/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="notification_voicemail_no_vm_number" msgid="5433652017869242375">"Telefonsvarernummeret er ukendt"</string>

    <string name="notification_network_selection_title" msgid="6785177943238085441">"Ingen dækning"</string>

    <string name="notification_network_selection_text" msgid="9097902390701009591">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>

    <string name="notification_action_answer" msgid="8418990052527593953">"Svar"</string>

    <string name="notification_action_answer" msgid="8418990052527593953">"Besvar"</string>

    <string name="notification_action_end_call" msgid="2152010639043225860">"Læg på"</string>

    <string name="notification_action_answer_video" msgid="2400233093494856655">"Video"</string>

    <string name="notification_action_answer_voice" msgid="3206168292649273866">"Tale"</string>
@@ -143,11 +143,11 @@ 
    <string name="respond_via_sms_custom_message" msgid="8210393177674619127">"Skriv dit eget svar…"</string>

    <string name="custom_message_cancel" msgid="5920059627508662163">"Annuller"</string>

    <string name="custom_message_send" msgid="3798076337006735995">"Send"</string>

    <string name="description_target_answer" msgid="1111945818996518320">"Svar"</string>

    <string name="description_target_answer" msgid="1111945818996518320">"Besvar"</string>

    <string name="description_target_send_sms" msgid="3652217769615310018">"Send sms"</string>

    <string name="description_target_decline" msgid="7108154434759234035">"Afvis"</string>

    <string name="description_target_answer_video_call" msgid="4655616461181308405">"Besvar som videoopkald"</string>

    <string name="description_target_answer_audio_call" msgid="3234714934649708854">"Besvar som lydopkald"</string>

    <string name="description_target_answer_audio_call" msgid="3234714934649708854">"Besvar som taleopkald"</string>

    <string name="description_target_accept_upgrade_to_video_request" msgid="384894008955682630">"Acceptér anmodning om video"</string>

    <string name="description_target_decline_upgrade_to_video_request" msgid="7342968876159189300">"Afvis videoanmodning"</string>

    <string name="description_target_accept_upgrade_to_video_transmit_request" msgid="4586773853073826378">"Acceptér anmodning om udgående video"</string>

InCallUI/res/values-de/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
    <string name="card_title_callback_number_emergency" msgid="8916355112472826080">"Deine Notrufnummer lautet:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>

    <string name="notification_dialing" msgid="8080968169444117163">"Rufaufbau"</string>

    <string name="notification_missedCallTitle" msgid="2774630248151712215">"Verpasster Anruf"</string>

    <string name="notification_missedCallsTitle" msgid="263275811089605859">"Verpasste Anrufe"</string>

    <string name="notification_missedCallsMsg" msgid="69408330370667429">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> verpasste Anrufe"</string>

    <string name="notification_missedCallsTitle" msgid="263275811089605859">"Entgangene Anrufe"</string>

    <string name="notification_missedCallsMsg" msgid="69408330370667429">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> entgangene Anrufe"</string>

    <string name="notification_missedCallTicker" msgid="1599269453813734699">"Verpasster Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>

    <string name="notification_ongoing_call" msgid="8633734299234807397">"Aktiver Anruf"</string>

    <string name="notification_ongoing_work_call" msgid="3465083293325006579">"Aktiver geschäftlicher Anruf"</string>

InCallUI/res/values-eu-rES/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
    <string name="card_title_video_call_requesting" msgid="1611293204379882739">"Bideo-deia eskatzen"</string>

    <string name="card_title_video_call_error" msgid="8488074823425848193">"Ezin da konektatu bideo-deia"</string>

    <string name="card_title_video_call_rejected" msgid="2885215432045215465">"Baztertu egin da bideo-deia egiteko eskaera"</string>

    <string name="card_title_callback_number" msgid="7646082782307705748">"Deiak itzultzeko zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>

    <string name="card_title_callback_number_emergency" msgid="8916355112472826080">"Larrialdi-deiak itzultzeko zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>

    <string name="card_title_callback_number" msgid="7646082782307705748">"Dei-erantzunetarako zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>

    <string name="card_title_callback_number_emergency" msgid="8916355112472826080">"Larrialdi-dei bidez erantzuteko zenbakia:\n <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>

    <string name="notification_dialing" msgid="8080968169444117163">"Deitzen"</string>

    <string name="notification_missedCallTitle" msgid="2774630248151712215">"Dei bat galdu duzu"</string>

    <string name="notification_missedCallsTitle" msgid="263275811089605859">"Dei batzuk galdu dituzu"</string>
@@ -192,7 +192,7 @@ 
    <string name="opening_hours" msgid="7803506319518398380">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>

    <string name="opens_tomorrow_at" msgid="3567511490448488788">"<xliff:g id="OPEN_TIME">%s</xliff:g> da biharko irekitze-ordua"</string>

    <string name="opens_today_at" msgid="6281212768937222891">"<xliff:g id="OPEN_TIME">%s</xliff:g> da gaurko irekitze-ordua"</string>

    <string name="closes_today_at" msgid="4822369201263491509">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da itxiera-ordua"</string>

    <string name="closes_today_at" msgid="4822369201263491509">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da ixte-ordua"</string>

    <string name="closed_today_at" msgid="4060072663433467233">"<xliff:g id="CLOSE_TIME">%s</xliff:g> da gaurko itxiera-ordua"</string>

    <string name="open_now" msgid="4615706338669555999">"Irekita dago"</string>

    <string name="closed_now" msgid="2635314668145282080">"Itxita dago"</string>