diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-24 12:44:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 12:44:37 -0700 |
| commit | 0ba1940b13c2e9f73b8331b0472e0fc76b7a5a16 (patch) | |
| tree | 6331c8cf057d1b716980e55efa1467d3c727b526 /res/values | |
| parent | 83a41f36137977ad5d6290d7ec71b6adb05abb0c (diff) | |
| parent | 15f9939b84542319fee7039b55dacb77d1fc2789 (diff) | |
| download | packages_apps_settings-0ba1940b13c2e9f73b8331b0472e0fc76b7a5a16.zip packages_apps_settings-0ba1940b13c2e9f73b8331b0472e0fc76b7a5a16.tar.gz packages_apps_settings-0ba1940b13c2e9f73b8331b0472e0fc76b7a5a16.tar.bz2 | |
am 15f9939b: am c01b0c83: Allow user to see and stop heavy-weight processes.
Merge commit '15f9939b84542319fee7039b55dacb77d1fc2789'
* commit '15f9939b84542319fee7039b55dacb77d1fc2789':
Allow user to see and stop heavy-weight processes.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index bff1bee..e318b16 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1838,6 +1838,9 @@ found in the list of installed applications.</string> <!-- Running service details, default description for services that are started. --> <string name="service_stop_description">This service was started by its application. Stopping it may cause the application to fail.</string> + <!-- Running service details, description for running heavy-weight process. --> + <string name="heavy_weight_stop_description">This application can not safely + be stopped. Doing so may lose some of your current work.</string> <!-- Running service details, default description for services that are managed. --> <string name="service_manage_description"><xliff:g id="client_name">%1$s</xliff:g>: currently in use. Touch Settings to control it.</string> |