summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-07-17 14:17:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-17 14:17:12 +0000
commit6530a89c8ebd14a9576cd3f724ce0e1d6326df64 (patch)
treee9053bc4935b576271f86b55324a52b2fc091346 /packages
parent7c7e18a2bdd46507cb28fa430cffae2f3c0f1384 (diff)
parent1b68d262cd25428640f3f278402046312759f57d (diff)
downloadframeworks_base-6530a89c8ebd14a9576cd3f724ce0e1d6326df64.zip
frameworks_base-6530a89c8ebd14a9576cd3f724ce0e1d6326df64.tar.gz
frameworks_base-6530a89c8ebd14a9576cd3f724ce0e1d6326df64.tar.bz2
am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit 'efe8514f89c8f8ecd256f8fc1ef577cbcec05421': Update data limit notification icon + strings.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/values/strings.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 751c889..28b0853 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -416,17 +416,17 @@
<string name="accessibility_quick_settings_less_time">Less time</string>
<!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_3g_title">2G-3G data disabled</string>
+ <string name="data_usage_disabled_dialog_3g_title">2G-3G data is off</string>
<!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_4g_title">4G data disabled</string>
+ <string name="data_usage_disabled_dialog_4g_title">4G data is off</string>
<!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_mobile_title">Mobile data disabled</string>
+ <string name="data_usage_disabled_dialog_mobile_title">Cellular data is off</string>
<!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
- <string name="data_usage_disabled_dialog_title">Data disabled</string>
+ <string name="data_usage_disabled_dialog_title">Data is off</string>
<!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
- <string name="data_usage_disabled_dialog">You\'ve reached the specified data usage limit.\n\nIf you re-enable data, you may be charged by the operator.</string>
+ <string name="data_usage_disabled_dialog">Your device turned off data because it reached the limit you set.\n\nTurning it back on may lead to charges from your carrier.</string>
<!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
- <string name="data_usage_disabled_dialog_enable">Re-enable data</string>
+ <string name="data_usage_disabled_dialog_enable">Turn on data</string>
<!-- Text to display underneath the graphical signal strength meter when
no connection is available. [CHAR LIMIT=20] -->