From 9050823ccf6f512e06ad65c8a741cb17cbc4a833 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Fri, 24 Mar 2017 09:31:16 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/151128062

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/150756069 (3/21/2017) to cl/151128062 (3/24/2017).

Notable this release:
- Explicitly enumerate host and target dependencies.
- Update proguard flag references.

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.

Bug: 33210202 36511925

Addresses
33210202 - Proguard support
36511925 - Compiler warnings when building against platform sdk

Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae
---
 .../dialer/app/voicemail/error/res/values-en-rGB/strings.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'java/com/android/dialer/app/voicemail/error/res/values-en-rGB')

diff --git a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
index 28117ea47..c1455cafc 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values-en-rGB/strings.xml
@@ -44,14 +44,10 @@
     <string name="voicemail_error_inbox_near_full_message" msgid="354118612203528244">"You won\'t be able to receive new voicemail if your inbox is full."</string>
     <string name="voicemail_error_inbox_full_title" msgid="249268068442046872">"Can\'t receive new voicemail"</string>
     <string name="voicemail_error_inbox_full_message" msgid="5788411018158899123">"Your inbox is full. Try deleting some messages to receive new voicemail."</string>
-    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_title (3083779676549536189) -->
-    <skip />
-    <!-- no translation found for voicemail_error_inbox_full_turn_archive_on_message (4236256841748725792) -->
-    <skip />
-    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_title (6118464905488477869) -->
-    <skip />
-    <!-- no translation found for voicemail_error_inbox_almost_full_turn_archive_on_message (7289015622668426730) -->
-    <skip />
+    <string name="voicemail_error_inbox_full_turn_archive_on_title" msgid="3083779676549536189">"[Experimental] Turn on extra storage and backup"</string>
+    <string name="voicemail_error_inbox_full_turn_archive_on_message" msgid="4236256841748725792">"Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages. "<b><i>"This feature is currently being tested "</i></b>"and will potentially delete voicemail from your voicemail server. We do not promise to support this feature in the future. We would love your feedback though."</string>
+    <string name="voicemail_error_inbox_almost_full_turn_archive_on_title" msgid="6118464905488477869">"[Experimental] Turn on extra storage and backup"</string>
+    <string name="voicemail_error_inbox_almost_full_turn_archive_on_message" msgid="7289015622668426730">"Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages. "<b><i>"This feature is currently being tested "</i></b>"and will potentially delete voicemail from your voicemail server. We do not promise to support this feature in the future. We would love your feedback though."</string>
     <string name="voicemail_error_pin_not_set_title" msgid="1287168514277948082">"Set your voicemail PIN"</string>
     <string name="voicemail_error_pin_not_set_message" msgid="3802375002103184625">"You\'ll need a voicemail PIN whenever you call to access your voicemail."</string>
     <string name="voicemail_error_unknown_title" msgid="7214482611706360680">"Unknown error"</string>
-- 
cgit v1.2.3