diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-05 00:35:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-05 00:35:03 +0000 |
| commit | 3a292c344c845f0620639c9eecdd5c3353ff5265 (patch) | |
| tree | 3b8746686143df521d5bfec88c72c7e2668feb87 /java/com/android/dialer/app/voicemail/error/res/values/strings.xml | |
| parent | bc07ed7f31845b0565990999e90510c90e8dad9b (diff) | |
| parent | 665bd416945c0c089f78d733e45d7532eb74f5b4 (diff) | |
Merge changes I57e6e0b5,I8aa9d5a1,Id2faa542,I9c4bfd89
* changes:
Inserting post call notes now compares notifications using fuzzy matching.
Do not crash when LightbringerTech receives device orientation update
Copy directory list into new list to prevent modifications.
Remove 'learn more' link from verizon voicemail TOS text and using non-breaking space in dialer TOS 'learn more' link.
Diffstat (limited to 'java/com/android/dialer/app/voicemail/error/res/values/strings.xml')
| -rw-r--r-- | java/com/android/dialer/app/voicemail/error/res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index 3df0e6660..bf5794b0b 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -137,7 +137,7 @@ <string translatable="false" name="verizon_domestic_customer_support_display_number">(800) 922–0204</string> <string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string> - <string name="verizon_terms_and_conditions_message">%1$s\n\nBy turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s</string> + <string name="verizon_terms_and_conditions_message">%1$s By turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s</string> <string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string> <string name="dialer_terms_and_conditions_message">%s</string> @@ -174,10 +174,10 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual </string> <string name="dialer_terms_and_conditions_for_verizon_1.0"> - See and listen to your messages, without having to call voicemail. %s + See and listen to your messages, without having to call voicemail. </string> - <string name="dialer_terms_and_conditions_learn_more">Learn more</string> + <string name="dialer_terms_and_conditions_learn_more">Learn more</string> <!-- TODO(mdooley): STOP SHIP, get real url, b/65734734 --> <string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://www.google.com</string> |