diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-18 10:52:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:52:33 -0700 |
| commit | 29c749b6530bd1fe1ba66483014f7af6708916e1 (patch) | |
| tree | 986cb0bca05456cf776001da1a5fc2bc039ff3ff /res/values | |
| parent | dba120535f2b76bda83f7c2b300721ef54a488e3 (diff) | |
| parent | 2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2 (diff) | |
| download | packages_apps_Settings-29c749b6530bd1fe1ba66483014f7af6708916e1.zip packages_apps_Settings-29c749b6530bd1fe1ba66483014f7af6708916e1.tar.gz packages_apps_Settings-29c749b6530bd1fe1ba66483014f7af6708916e1.tar.bz2 | |
am 2027328c: am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev
* commit '2027328c7bca44ff6a0dc8c2ff64a8af052f4ea2':
Implement issue #6633077: Improve permissions display for...
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ceffa3c..98490b7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2495,6 +2495,28 @@ <string name="security_settings_desc" product="tablet">This app can access the following on your tablet:</string> <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. --> <string name="security_settings_desc" product="default">This app can access the following on your phone:</string> + <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading. + This describes the permissions that the application has. It is used when multiple packages are contributing + to the permissions and need to be listed here. --> + <string name="security_settings_desc_multi" product="tablet">This app can access the following on your tablet. + In order to improve performance and reduce memory usage, some of these permissions + are available to <xliff:g id="base_app_name">%1$s</xliff:g> + because it runs in the same process as <xliff:g id="additional_apps_list">%2$s</xliff:g>:</string> + <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading. + This describes the permissions that the application has. It is used when multiple packages are contributing + to the permissions and need to be listed here. --> + <string name="security_settings_desc_multi" product="default">This app can access the following on your phone. + In order to improve performance and reduce memory usage, some of these permissions + are available to <xliff:g id="base_app_name">%1$s</xliff:g> + because it runs in the same process as <xliff:g id="additional_apps_list">%2$s</xliff:g>:</string> + <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. --> + <string name="join_two_items"><xliff:g id="first_item">%1$s</xliff:g> and <xliff:g id="second_item">%2$s</xliff:g></string> + <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list --> + <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g> and <xliff:g id="last_item">%2$s</xliff:g></string> + <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list --> + <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> <string name="computing_size">Computing\u2026</string> <string name="invalid_size_value">Couldn\'t compute package size.</string> <!-- String displayed when list is empty --> |