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
---
 java/com/android/incallui/res/values-is/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'java/com/android/incallui/res/values-is/strings.xml')

diff --git a/java/com/android/incallui/res/values-is/strings.xml b/java/com/android/incallui/res/values-is/strings.xml
index 795e952c6..8393510c6 100644
--- a/java/com/android/incallui/res/values-is/strings.xml
+++ b/java/com/android/incallui/res/values-is/strings.xml
@@ -33,8 +33,8 @@
     <string name="notification_missedCallTicker" msgid="238492086972857643">"Ósvarað símtal frá <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Samtal í gangi"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vinnusímtal í gangi"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Wi-Fi símtal stendur yfir"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Vinnusímtal í gangi um Wi-Fi"</string>
+    <string name="notification_ongoing_call_wifi" msgid="4393238962909277019">"Wi-Fi símtal stendur yfir"</string>
+    <string name="notification_ongoing_work_call_wifi" msgid="3169378605818323964">"Vinnusímtal í gangi um Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"Í bið"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Móttekið símtal"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Móttekið símtal með mynd"</string>
@@ -55,8 +55,8 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mikilvægt móttekið símtal með viðhengjum"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Vinnusímtal berst"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi símtal berst"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Vinnusímtal berst um Wi-Fi"</string>
+    <string name="notification_incoming_call_wifi" msgid="1020138378061234203">"Wi-Fi símtal berst"</string>
+    <string name="notification_incoming_work_call_wifi" msgid="3549264481033044684">"Vinnusímtal berst um Wi-Fi"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Símtal sem berst er hugsanlega úr ruslnúmeri"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Myndbeiðni berst"</string>
     <string name="notification_network_selection_title" msgid="8639159088474275747">"Ekkert símasamband"</string>
@@ -73,7 +73,7 @@
     <string name="notification_take_video_call" msgid="4473387503712341390">"Þiggja myndsímtal"</string>
     <string name="incall_error_power_off" msgid="3244691852792529453">"Til að hringja símtal þarftu fyrst að slökkva á flugstillingu."</string>
     <string name="incall_error_emergency_only" msgid="8313690034696753566">"Ekki skráð á símkerfi."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Farsímakerfi ekki til staðar."</string>
+    <string name="incall_error_out_of_service" msgid="5027539470868484145">"Farsímakerfi ekki tiltækt."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Sláðu inn gilt númer til að hringja símtal."</string>
     <string name="incall_error_call_failed" msgid="5560521345862514733">"Ekki hægt að hringja."</string>
     <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Ræsir MMI-runu…"</string>
@@ -134,8 +134,8 @@
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ljúka símtali"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Símafundur"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Í símtali"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Símtal heldur áfram og notar farsímagögn…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Símtal heldur áfram og notar farsímagögn…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ekki birta þetta aftur"</string>
 </resources>
-- 
cgit v1.2.3