diff options
| author | John Huang <jsh@google.com> | 2012-09-16 14:31:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-16 14:31:18 -0700 |
| commit | 70c6e0fb33efd3ccedc5bac654296e6d556b5fd0 (patch) | |
| tree | 1814af6cd2d114c682576f4b32d32158e1f0bb21 /res/values | |
| parent | 260d930e304b768c31694521375876f11b8367f3 (diff) | |
| parent | 3465b67740e17711af2b36b09e2250a02275d860 (diff) | |
| download | packages_apps_Settings-70c6e0fb33efd3ccedc5bac654296e6d556b5fd0.zip packages_apps_Settings-70c6e0fb33efd3ccedc5bac654296e6d556b5fd0.tar.gz packages_apps_Settings-70c6e0fb33efd3ccedc5bac654296e6d556b5fd0.tar.bz2 | |
Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e699dc2..6b1c3f9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -746,4 +746,14 @@ <item>2</item> <item>1</item> </string-array> + + <!-- Values for premium SMS permission selector [CHAR LIMIT=30] --> + <string-array name="security_settings_premium_sms_values"> + <!-- Ask user before sending to premium SMS short code. --> + <item>Ask</item> + <!-- Never allow app to send to premium SMS short code. --> + <item>Never allow</item> + <!-- Always allow app to send to premium SMS short code. --> + <item>Always allow</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 201f4e2..cc2bb44 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2567,6 +2567,10 @@ <string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string> <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list --> <string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string> + <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] --> + <string name="security_settings_billing_desc">This app may charge you money:</string> + <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] --> + <string name="security_settings_premium_sms_desc">Send premium SMS</string> <string name="computing_size">Computing\u2026</string> <string name="invalid_size_value">Couldn\'t compute package size.</string> <!-- String displayed when list is empty --> |