summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-26 12:29:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-26 12:29:40 -0700
commit320541210997a490a37ef24f27f6c40cbdb55561 (patch)
treeba16483ab93abb50bfd983195df80198071676b6 /res/values
parent27fe995f028cf78343d0e836c845d38a61b58aac (diff)
parent77ba65eaec3587ad9fcdeea5e6937c8821838add (diff)
downloadpackages_apps_Settings-320541210997a490a37ef24f27f6c40cbdb55561.zip
packages_apps_Settings-320541210997a490a37ef24f27f6c40cbdb55561.tar.gz
packages_apps_Settings-320541210997a490a37ef24f27f6c40cbdb55561.tar.bz2
am 77ba65ea: am 49f4ba4a: Various small UI cleanup in settings.
Merge commit '77ba65eaec3587ad9fcdeea5e6937c8821838add' * commit '77ba65eaec3587ad9fcdeea5e6937c8821838add': Various small UI cleanup in settings.
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a8ae920..26f0970 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1500,7 +1500,7 @@
<!-- Security & location settings screen, setting check box label if the GPS receiver should be enabled -->
<string name="location_gps">Use GPS satellites</string>
<!-- Security & location settings screen, setting summary when Use GPS satellites check box is selected -->
- <string name="location_street_level">When locating, accurate to street level (uncheck to conserve battery)</string>
+ <string name="location_street_level">When locating, accurate to street level</string>
<!-- Security & location settings screen, setting summary when Use GPS satellites check box is clear -->
<string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
<!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
@@ -1714,7 +1714,7 @@
<!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
<string name="unknown">Unknown</string>
<!-- Manage applications screen, menu item. Sorts all of the apps in the list alphabetically. -->
- <string name="sort_order_alpha">Sort</string>
+ <string name="sort_order_alpha">Sort by name</string>
<!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size. This is used to uninstall when space is getting low. -->
<string name="sort_order_size">Sort by size</string>
<!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
@@ -2185,11 +2185,11 @@ found in the list of installed applications.</string>
<string name="battery_sugg_bluetooth_headset">Try connecting to a different bluetooth device</string>
<!-- Description for power consumed by applications -->
- <string name="battery_desc_apps">Battery used by applications when running</string>
+ <string name="battery_desc_apps">Battery used by application</string>
<!-- Suggestion for exploring application info to stop or uninstall -->
<string name="battery_sugg_apps_info">Stop or uninstall the application</string>
<!-- Suggestion for getting apps to consume less power due to GPS-->
- <string name="battery_sugg_apps_gps">"Turn off GPS when you're not using it"</string>
+ <string name="battery_sugg_apps_gps">"Manually control GPS to prevent application from using it"</string>
<!-- Suggestion for getting apps to consume less power -->
<string name="battery_sugg_apps_settings">The application may offer settings to reduce battery use</string>