summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-10-21 10:50:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 10:50:53 -0700
commit707ef1535eb59e9cb9496088049df1f25aa42e92 (patch)
treee2c4883601a7cd0d44e760fbbbe5150ed67ef739 /res
parent04f09085f85d094207d22ae8969102bd48178180 (diff)
parente664fbafc566f31f844dd543c30064e92f3653f7 (diff)
downloadandroid_packages_providers_DownloadProvider-707ef1535eb59e9cb9496088049df1f25aa42e92.tar.gz
android_packages_providers_DownloadProvider-707ef1535eb59e9cb9496088049df1f25aa42e92.tar.bz2
android_packages_providers_DownloadProvider-707ef1535eb59e9cb9496088049df1f25aa42e92.zip
am e664fbaf: am 3c3ed3c1: bug:3083060 UI tweaks to DownloadManager screens
Merge commit 'e664fbafc566f31f844dd543c30064e92f3653f7' * commit 'e664fbafc566f31f844dd543c30064e92f3653f7': bug:3083060 UI tweaks to DownloadManager screens
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml22
1 files changed, 13 insertions, 9 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8deee358..a5bd7a45 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -160,30 +160,34 @@
over the mobile network and Wi-Fi is required. The user has the choice to either queue the
download to start next time Wi-Fi is available or cancel the download altogether. [CHAR
LIMIT=50] -->
- <string name="wifi_required_title">Download too large for mobile network</string>
+ <string name="wifi_required_title">Download too large for operator network</string>
<!-- Text for dialog when a download exceeds the carrier-specified maximum size of downloads
over the mobile network and Wi-Fi is required. The user has the choice to either queue the
download to start next time Wi-Fi is available or cancel the download altogether. [CHAR
LIMIT=200] -->
- <string name="wifi_required_body">You can\'t download a <xliff:g id="size" example="12.3KB">%s
- </xliff:g> file on this mobile network.\n\nTouch <xliff:g id="queue_text" example="Queue">%s
- </xliff:g> to download this file when next connected to a Wi-Fi network.</string>
+ <string name="wifi_required_body">You must use WiFi to complete this
+ <xliff:g id="size" example="12.3KB">%s
+ </xliff:g> download. \n\nClick <xliff:g id="queue_text" example="Queue">%s
+ </xliff:g> to begin this download the next time you are connected to a WiFi
+ network.</string>
<!-- Title for dialog when a download exceeds the carrier-specified recommended maximum size of
downloads over the mobile network, and the user may choose to start the download over mobile
anyway or to queue for download to start next time a Wi-Fi connection is available [CHAR
LIMIT=50] -->
- <string name="wifi_recommended_title">Queue for Wi-Fi download?</string>
+ <string name="wifi_recommended_title">Queue for download later?</string>
<!-- Text for dialog when a download exceeds the carrier-specified recommended maximum size of
downloads over the mobile network, and the user may choose to start the download over mobile
anyway or to queue for download to start next time a Wi-Fi connection is available [CHAR
LIMIT=200] -->
- <string name="wifi_recommended_body">Downloading this <xliff:g id="size" example="12.3KB">%s
- </xliff:g> file on this mobile network risks draining your battery and extra charges from
- your carrier.\n\nTouch <xliff:g id="queue_text" example="Queue">%s</xliff:g> to download
- this file when next connected to a Wi-Fi network.</string>
+ <string name="wifi_recommended_body">Starting this <xliff:g id="size" example="12.3KB">%s
+ </xliff:g> download now may shorten your battery life and/or result in
+ excessive usage of your mobile data connection, which can lead to charges by
+ your mobile operator depending on your data plan.\n\n
+ Click <xliff:g id="queue_text" example="Queue">%s</xliff:g> below to begin this download
+ the next time you are connected to a WiFi network.</string>
<!-- Text for button to queue a download to start next time Wi-Fi is available [CHAR LIMIT=25]