diff options
| author | John Wang <johnwang@google.com> | 2011-11-14 12:10:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-14 12:10:16 -0800 |
| commit | 72a31ab98f8687aa48fce028d54e79929780a302 (patch) | |
| tree | ed44b4fd31e370cd308e7f246a8dc13cf08e6cd7 /core | |
| parent | c93a151fde7d616c22b86ae458b3d015e3820d5e (diff) | |
| parent | e81932e92a773538e1ad1ad1d4bfd8f241860c8d (diff) | |
| download | frameworks_base-72a31ab98f8687aa48fce028d54e79929780a302.zip frameworks_base-72a31ab98f8687aa48fce028d54e79929780a302.tar.gz frameworks_base-72a31ab98f8687aa48fce028d54e79929780a302.tar.bz2 | |
Merge "[maguro] Fix STK issues" into ics-mr1
Diffstat (limited to 'core')
| -rwxr-xr-x | core/res/res/values/strings.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9b8be85..c8ba26a 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- /* //device/apps/common/assets/res/any/strings.xml ** @@ -3365,4 +3365,13 @@ <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] --> <string name="list_delimeter">", "</string> + <!-- STK sending DTMF, SMS, USSD, SS --> + <string name="sending">Sending...</string> + + <!-- STK launch Browser --> + <string name="launchBrowserDefault">Launch Browser?</string> + + <!-- STK setup Call --> + <string name="SetupCallDefault">Accept Call?</string> + </resources> |