summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-05-15 11:39:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-15 11:39:17 -0700
commitcda0663eb9c3a324c543c504647c7661f2ac7b35 (patch)
treeb70b25f3804e6cba6c0a5d9a7e976fd9b91ecd36 /res/values
parent53fa78fcb237e52733d00a93a29485c4b3d7d290 (diff)
parentcaf15613c29870850da952e51aaebb8b84867c49 (diff)
downloadpackages_apps_settings-cda0663eb9c3a324c543c504647c7661f2ac7b35.zip
packages_apps_settings-cda0663eb9c3a324c543c504647c7661f2ac7b35.tar.gz
packages_apps_settings-cda0663eb9c3a324c543c504647c7661f2ac7b35.tar.bz2
Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml20
1 files changed, 18 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fe737bd..d881af3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1897,8 +1897,6 @@
<!-- Storage setting. Menu option for USB transfer settings [CHAR LIMIT=30]-->
<string name="storage_menu_usb">USB computer connection</string>
- <!-- Storage setting. Menu option to enforce read external storage permission. [CHAR LIMIT=30]-->
- <string name="storage_menu_enforce_read_external">Enforce read external</string>
<!-- Storage setting. Title for USB transfer settings [CHAR LIMIT=30]-->
<string name="storage_title_usb">USB computer connection</string>
@@ -2799,6 +2797,24 @@
<!-- Warning text to user about the implications of enabling USB debugging -->
<string name="dev_settings_warning_message">These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave.</string>
+ <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
+ <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+ <string name="enforce_read_external_summary" product="nosdcard">Apps must request permission to read USB storage</string>
+ <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_confirm_title" product="nosdcard">Protect USB storage?</string>
+ <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+ <string name="enforce_read_external_confirm_message" product="nosdcard">When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
+
+ <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_title" product="default">Protect SD card</string>
+ <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+ <string name="enforce_read_external_summary" product="default">Apps must request permission to read SD card</string>
+ <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+ <string name="enforce_read_external_confirm_title" product="default">Protect SD card?</string>
+ <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+ <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
+
<!-- Title for the screen that lets the user choose a gadget to add to the home screen
(or other screens that can host gadgets). Note to translators: we're still determining
the final name for Gadgets/Widgets, so please translate both for now. -->