summaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-01 15:29:30 -0700
committerJeff Sharkey <jsharkey@android.com>2011-08-01 16:36:38 -0700
commite2afc0f283f58ce60c107643978bfff25ec5d5c1 (patch)
tree4a5abc2ce9a3483e9ced7401c89b2ab7fbf32a9f /res/values/strings.xml
parenta861ebffe0dc6eacc83343f97044da4c0370c1b2 (diff)
downloadpackages_apps_Settings-e2afc0f283f58ce60c107643978bfff25ec5d5c1.tar.gz
packages_apps_Settings-e2afc0f283f58ce60c107643978bfff25ec5d5c1.tar.bz2
packages_apps_Settings-e2afc0f283f58ce60c107643978bfff25ec5d5c1.zip
Data usage axis grow/shrink, other fixes.
When dragging vertical sweeps near edges, grow or shrink axis scale to give users access to larger limits. Triggers 10% for each 250ms that user continues holding. Change axis math to support arbitrary ranges beyond [0,5GB]. Show "empty" message when no application details found. Added strings that didn't appear in default language. Better sweep margins using dip instead of scale units. Format time ranges in local time instead of UTC. Only show dashed estimate when it would reach near warning or limit. Extend app usage series until "now" when buckets missing. Bug: 5096685, 5092538, 5058158, 5058114, 5058024, 4643457 Change-Id: I45cf33f7f3baeba1bfa5b21f31cb0a12006f62fa
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e15164038..2302dcb99 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,6 +230,8 @@
<string name="bluetooth_disconnect_title">Disconnect?</string>
<!-- Bluetooth settings. Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
+ <!-- Bluetooth settings. Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+ <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be disconnected."</string>
<!-- Bluetooth settings. Message when connected to a device -->
<string name="bluetooth_connected">Connected</string>
<!-- Bluetooth settings. Message when a device is disconnected -->
@@ -1788,8 +1790,10 @@
<string name="usb_mtp_summary">Lets you transfer media files on Windows, or using Android File Transfer on Mac (see www.android.com/filetransfer)</string>
<!-- Storage setting. Title for PTP checkbox [CHAR LIMIT=30]-->
<string name="usb_ptp_title">Camera (PTP)</string>
- <!-- Storage setting. Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+ <!-- Storage setting. Label for installer CD [CHAR LIMIT=30]-->
<string name="usb_ptp_summary">Lets you transfer photos using camera software, and transfer any files on computers that don\'t support MTP</string>
+ <!-- Storage setting. Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+ <string name="usb_label_installer_cd">"Install file-transfer tools"</string>
<!-- Phone info screen, section titles: -->
<string name="battery_status_title">Battery status</string>
@@ -3409,6 +3413,8 @@ found in the list of installed applications.</string>
<string name="data_usage_change_cycle">Change cycle\u2026</string>
<!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
<string name="data_usage_pick_cycle_day">Day of month to reset data usage cycle:</string>
+ <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+ <string name="data_usage_empty">No applications used data during this period.</string>
<!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
<string name="data_usage_disable_mobile_limit">Disable mobile data at limit</string>