diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-10-25 14:48:52 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-10-25 14:48:52 -0700 |
| commit | dafee13113e2ce1561060d67c8b7c15043edbbb6 (patch) | |
| tree | c4725c9910c677ed1516f0918b5a5233dc2b717b /res/values/strings.xml | |
| parent | ea893d5ca636bd289b09a63b5f1aa6ba1cf376e4 (diff) | |
| parent | aed1c65e9d66ed0bb7076185d54b98fdd299da31 (diff) | |
| download | packages_apps_PhoneCommon-dafee13113e2ce1561060d67c8b7c15043edbbb6.tar.gz packages_apps_PhoneCommon-dafee13113e2ce1561060d67c8b7c15043edbbb6.tar.bz2 packages_apps_PhoneCommon-dafee13113e2ce1561060d67c8b7c15043edbbb6.zip | |
Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/packages/apps/PhoneCommon into 71
Android 7.1.0 release 4
Change-Id: Ieaa15a012c4ee00e9cd60b29de473ccf9bc984a1
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3431aab..20b8976 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -119,10 +119,19 @@ <string name="incall_error_missing_voicemail_number">Voicemail number unknown.</string> <!-- In-call screen: call failed because you cannot make video calls when TTY is enabled. --> <string name="callFailed_video_call_tty_enabled">Cannot make video calls when TTY is enabled.</string> + <!-- In-call screen: call ended because it was transferred to another device. --> + <string name="callEnded_pulled">Call transferred to another device.</string> <!-- Choice in the ringtone picker. If chosen, there will be silence instead of a ringtone played. --> <string name="ringtone_silent">None</string> <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, this is shown instead. For example, if the ringtone was on a SD card and it had been removed, this would be shown for ringtones on that SD card. --> <string name="ringtone_unknown">Unknown ringtone</string> <string name="to_hint">1111:to;sip:abby@example.com:bcc;sip:bill@example.com:cc;</string> + + <!-- In-call screen: call ended because the user has reached the maximum number of calls on their current devices and other devices. --> + <string name="callFailed_maximum_reached">All available lines are in use. To make a call, disconnect one of the calls on this device, or on one of your other devices.</string> + <!-- In-call screen: call ended because the user disabled data on their device --> + <string name="callFailed_data_disabled">Call ended because cellular data was disabled.</string> + <!-- In-call screen: call ended because the cellular data limit has been reached --> + <string name="callFailed_data_limit_reached">Call ended because the cellular data limit has been reached.</string> </resources> |