diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 14:35:00 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 14:35:00 -0600 |
| commit | 5210cd471512336a99a327e87160a518857fab35 (patch) | |
| tree | b938426523f4b654219fd97bfcd4c62ffcdf9210 /ui/res/values/strings.xml | |
| parent | d12dd16fd9ebe0dbbb4d95ee75292d8516204e8e (diff) | |
| parent | 3a5f5eafb34eaa4963c801882148e8f61514a61b (diff) | |
| download | android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.tar.gz android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.tar.bz2 android_packages_providers_DownloadProvider-5210cd471512336a99a327e87160a518857fab35.zip | |
resolve merge conflicts of 3a5f5ea to nyc-dev-plus-aosp
Change-Id: Ib1bf6fc558789dcf9bcf81cea19e551ca9b49642
Diffstat (limited to 'ui/res/values/strings.xml')
| -rw-r--r-- | ui/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/res/values/strings.xml b/ui/res/values/strings.xml index 9e625ac7..3555e236 100644 --- a/ui/res/values/strings.xml +++ b/ui/res/values/strings.xml @@ -106,6 +106,10 @@ <!-- Text for button appearing in a dialog to restart a download, either one that failed or one for which the downloaded file is now missing [CHAR LIMIT=25] --> <string name="retry_download">Retry</string> + <!-- Text for button to start a download over the mobile connection now, even though it's over + the carrier-specified recommended maximum size for downloads over the mobile connection + [CHAR LIMIT=25] --> + <string name="start_now_download">Start now</string> <!-- Text for button appearing in the pop-up selection menu to deselect all currently selected downloads in the download list [CHAR LIMIT=25] --> <string name="deselect_all">Deselect all</string> |