From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 31 Aug 2017 06:57:16 -0700
Subject: Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../com/android/incallui/res/values-af/strings.xml | 80 ++--------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

(limited to 'java/com/android/incallui/res/values-af')

diff --git a/java/com/android/incallui/res/values-af/strings.xml b/java/com/android/incallui/res/values-af/strings.xml
index 5dacaaa8d..04e989c9d 100644
--- a/java/com/android/incallui/res/values-af/strings.xml
+++ b/java/com/android/incallui/res/values-af/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Foon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Konferensie-oproep"</string>
-    <string name="call_lost" msgid="2082971531689406145">"Oproep is ontkoppel"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Stuur die volgende tone?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Stuur luitone\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Stuur"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Nee"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Vervang die plekhouerkarakter met"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Konferensie-oproep <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Stemboodskapnommer"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Bel"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Gemiste oproep vanaf <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Oproep aan die gang"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Voortdurende werkoproep"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Voortdurende Wi-Fi-oproep"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Voortdurende Wi-Fi-werkoproep"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Deurlopend <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Inkomende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-oproep"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi-werkoproep"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrike inkomende oproep met foto, boodskap en ligging"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrike inkomende oproep met aanhegsels"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende werkoproep"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Inkomende Wi-Fi-oproep"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Inkomende Wi-Fi-werkoproep"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende verdagte strooipos-oproep"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkomende videoversoek"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Geen diens nie"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Gekose netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie beskikbaar nie"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Lui af"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Stem"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Aanvaar"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Wys af"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Voortgesette oproep op \'n ander toestel"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Voortgesette video-oproep on \'n ander toestel"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Neem oproep"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Neem video-oproep"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Om \'n oproep te maak, skakel eers vliegtuigmodus af."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Nie geregistreer op netwerk nie."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Sellulêre netwerk nie beskikbaar nie."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Kan nie bel nie."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Begin MMI-volgorde…"</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Diens word nie gesteun nie."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Kan nie oproepe wissel nie."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Kan nie oproep skei nie."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Kan nie deurskakel nie."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Kan nie konferensieoproep maak nie."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Kan nie oproep verwerp nie."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Kan nie oproep(e) vrystel nie."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Noodoproep"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Skakel tans radio aan…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Geen sein nie. Probeer tans weer …"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Kan nie bel nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Kan nie bel nie. Skakel \'n noodnommer."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Gebruik sleutelbord om te bel"</string>
-    <string name="player_started" msgid="9177182657338033086">"Speler begin"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Speler gestop"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"Kamera is nie gereed nie"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"Kamera is gereed"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Onbekende oproepsessiegebeurtenis"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Ander oproepinstellings"</string>
     <string name="goPrivate" msgid="5269514638004595378">"gaan privaat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"kies kontak"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Luitoon en vibreer"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Bestuur konferensie-oproep"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Noodnommer"</string>
     <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Onlangse boodskappe"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Besigheidinligting"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> myl ver"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> km ver"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> – <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<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="2896787795283597856">"Maak môre om <xliff:g id="OPEN_TIME">%s</xliff:g> oop"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Maak vandag om <xliff:g id="OPEN_TIME">%s</xliff:g> oop"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Maak om <xliff:g id="CLOSE_TIME">%s</xliff:g> toe"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Het vandag om <xliff:g id="CLOSE_TIME">%s</xliff:g> toegemaak"</string>
-    <string name="open_now" msgid="5897306702060039512">"Nou oop"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Nou gesluit"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Ken jy <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"Is <xliff:g id="NUMBER">%1$s</xliff:g> strooipos?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeer en oproep is as strooipos aangegee."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"Oproep vanaf <xliff:g id="NUMBER">%1$s</xliff:g> is as nie strooipos nie aangegee."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Tik om by kontakte te voeg of strooiposnommer te blokkeer."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"Dit is die eerste keer wat hierdie nommer jou bel. As hierdie oproep strooipos was, kan jy hierdie nommer blokkeer en dit aangee."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Tik om as NIE STROOIPOS NIE aan te gee, of dit te blokkeer."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Ons vermoed dit was \'n strooiposser. As hierdie oproep nie strooipos was nie, tik NIE STROOIPOS NIE om ons fout aan te gee."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Blokkeer en gee aan"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Voeg kontak by"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"Nie strooipos nie"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Blokkeer nommer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Voeg by kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Blokkeer en gee strooipos aan"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"Nie strooipos nie"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Geen SIM of SIM-fout"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beëindig oproep"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Konferensie-oproep"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Besig met oproep"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Gaan voort met oproep deur sellulêre data te gebruik …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video-oproep sal op sellulêre netwerk bly. Standaard datakoste kan dalk geld."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gaan voort met oproep deur mobiele data te gebruik ..."</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video-oproep sal op mobiele netwerk bly. Standaard datakoste kan dalk geld."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Moenie dit weer wys nie"</string>
 </resources>
-- 
cgit v1.2.3