diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-04-25 22:00:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-25 22:00:12 +0000 |
| commit | 21462c63d5c903fe35cd232bc4de4b6201f77c35 (patch) | |
| tree | c38ae2f58cb39e4e17be37e8eec2fe040b4b6436 /ui/res | |
| parent | cb6766bd14fa94fa11cb07349ff33ee3c702d7b0 (diff) | |
| parent | 1ac1cc3e2b5b432829b193a42af12cf800cee788 (diff) | |
| download | android_packages_providers_DownloadProvider-21462c63d5c903fe35cd232bc4de4b6201f77c35.tar.gz android_packages_providers_DownloadProvider-21462c63d5c903fe35cd232bc4de4b6201f77c35.tar.bz2 android_packages_providers_DownloadProvider-21462c63d5c903fe35cd232bc4de4b6201f77c35.zip | |
resolve merge conflicts of 3a5f5ea to nyc-dev-plus-aosp am: 5210cd4
am: 1ac1cc3
* commit '1ac1cc3e2b5b432829b193a42af12cf800cee788':
Move DownloadManager to use JobScheduler.
Change-Id: I7dd7cad788510d8f831b660b295b4fb9cbc698ee
Diffstat (limited to 'ui/res')
| -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> |