From ea7890cd5e829ed3f0b5f726561c569690af2030 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 19 Jun 2017 12:40:59 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/159428781.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/158012278 (6/05/2017) to cl/159428781 (6/19/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030

Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484
---
 .../com/android/incallui/res/values-en-rIN/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/java/com/android/incallui/res/values-en-rIN/strings.xml b/java/com/android/incallui/res/values-en-rIN/strings.xml
index 5e0d20737..68509f080 100644
--- a/java/com/android/incallui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-en-rIN/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Ongoing Wi-Fi call"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Ongoing Wi-Fi work call"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Ongoing Wi‑Fi call"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Ongoing Wi‑Fi work call"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
@@ -55,15 +55,15 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Incoming Wi-Fi call"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Incoming Wi-Fi work call"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Incoming Wi‑Fi call"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Incoming Wi‑Fi work call"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"No service"</string>
     <string name="notification_network_selection_text" msgid="7190860774239009625">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"In-stream video"</string>
+    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
     <string name="notification_action_answer_voice" msgid="6237890905749760509">"Voice"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Not registered on network."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Mobile network not available."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"To place a call, enter a valid number."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Starting MMI sequence…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Couldn\'t switch to Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Video call will remain on mobile network. Standard data charges may apply."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
 </resources>
-- 
cgit v1.2.3