From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian 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 --- .../app/voicemail/error/res/values-en-rGB/strings.xml | 18 ++++++++++-------- 1 file changed, 10 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 a036950a6..64e9d8955 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 @@ -17,21 +17,20 @@ - "Turn off aeroplane mode" "Activating visual voicemail" "You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated." "Can\'t activate visual voicemail" - "Make sure that your phone has a mobile connection and try again." + "Make sure your phone has a mobile network connection and try again." "Turn off aeroplane mode and try again." "No connection" - "You won\'t be notified about new voicemail. If you\'re on Wi-Fi, you can check for voicemail by syncing now." + "You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now." "You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail." - "Your phone needs a mobile data connection to check voicemail." + "Your phone needs a mobile data connection to check voicemail." "Can\'t activate visual voicemail" "You can still call to check voicemail." "Can\'t update visual voicemail" - "Try again when your Wi-Fi or mobile connection is better. You can still call to check voicemail." - "Try again when your mobile data connection is better. You can still call to check voicemail." + "Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail." + "Try again when your mobile data connection is better. You can still call to check voicemail." "Can\'t update visual voicemail" "You can still call to check voicemail." "Can\'t update visual voicemail" @@ -50,7 +49,6 @@ "Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages." "Set your voicemail PIN" "You\'ll need a voicemail PIN whenever you call to access your voicemail." - "Unknown error" "Aeroplane mode settings" "Set PIN" "Try again" @@ -102,9 +100,13 @@ "Something went wrong" "Please contact Customer Service on %1$s and tell them that the error code is 9999." "Visual voicemail Terms and Conditions" - "You must accept Verizon Wireless\'s Terms and Conditions to use visual voicemail:\n\n%s" + "%1$s\n\nYou must accept Verizon Wireless\'s terms and conditions to use visual voicemail:\n\n%2$s" + "Turn on Visual Voicemail" + "%s" "Visual voicemail will be disabled if the Terms and Conditions are declined." "Disable visual voicemail" + "Voicemail transcription will be disabled if the terms and conditions are declined." + "Disable voicemail transcription" "Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed." "Set PIN" -- cgit v1.2.3