From d86e9b207afb8c6aadc1806e71cc9e6bc3e51a16 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 5 Oct 2011 17:43:06 -0700
Subject: [PATCH] Adjust data usage strings.

Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
---
 res/values/strings.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7307dffc5f0..8b98d73c3c2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3533,6 +3533,11 @@ found in the list of installed apps.</string>
     <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
     <string name="data_usage_label_background">Background</string>
 
+    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier's data usage accounting may differ.</string>
+    <!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+    <string name="data_usage_disclaimer" product="tablet">Measured by your tablet. Your carrier's data usage accounting may differ.</string>
+
     <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
     <string name="data_usage_disable_mobile">Disable mobile data?</string>
     <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
@@ -3597,7 +3602,9 @@ found in the list of installed apps.</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">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 accounting methods may vary.</string>
+    <string name="data_usage_limit_dialog" product="default">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit.</string>
+    <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog" product="tablet">Your <xliff:g id="networks" example="mobile">%1$s</xliff:g> data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit.</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>