diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-08-17 17:08:19 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-08-18 12:01:29 -0700 |
| commit | 131f9d6e0f82017ceca8777bff00f7b65bcfd3a9 (patch) | |
| tree | ecfb18397b43a6d211109befa56d8127f27acd68 /res/values | |
| parent | 30dde0f5a07e1b15de21d6a278721d918c5900be (diff) | |
| download | packages_apps_Settings-131f9d6e0f82017ceca8777bff00f7b65bcfd3a9.tar.gz packages_apps_Settings-131f9d6e0f82017ceca8777bff00f7b65bcfd3a9.tar.bz2 packages_apps_Settings-131f9d6e0f82017ceca8777bff00f7b65bcfd3a9.zip | |
Allow data usage policy on Wi-Fi networks.
Create NetworkPolicy when it doesn't already exist.
Bug: 4646471, 5085110
Change-Id: I38b8b03689710df06d1734a4b4d9e12d98794154
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index bbc91aaa0..c3e319f83 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3414,6 +3414,8 @@ found in the list of installed applications.</string> <string name="data_usage_disable_4g_limit">Disable 4G data at limit</string> <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> <string name="data_usage_disable_3g_limit">Disable 2G-3G data at limit</string> + <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> + <string name="data_usage_disable_wifi_limit">Disable Wi-Fi data at limit</string> <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] --> <string name="data_usage_tab_wifi">Wi-Fi</string> @@ -3459,11 +3461,7 @@ found in the list of installed applications.</string> <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] --> <string name="data_usage_limit_dialog_title">Limiting data usage</string> <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] --> - <string name="data_usage_limit_dialog_mobile">Your mobile data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string> - <!-- Body of dialog shown before user limits 3G data usage. [CHAR LIMIT=NONE] --> - <string name="data_usage_limit_dialog_3g">Your 2G-3G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string> - <!-- Body of dialog shown before user limits 4G data usage. [CHAR LIMIT=NONE] --> - <string name="data_usage_limit_dialog_4g">Your 4G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string> + <string name="data_usage_limit_dialog">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string> <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] --> <string name="data_usage_restrict_background_title">Restrict background data?</string> |