From e434bfb216682a6ca331fa54ce58a2bff7adf8d7 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Sat, 8 May 2010 15:20:24 -0700 Subject: [PATCH] String change - wifi tether = hotspot bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19 --- assets/html/en_us/tethering_help.html | 8 ++--- assets/html/en_us/tethering_wifi_help.html | 8 ++--- res/values/strings.xml | 31 ++++++++++--------- res/xml/tether_prefs.xml | 3 +- res/xml/wireless_settings.xml | 4 +-- src/com/android/settings/TetherSettings.java | 7 +++++ .../android/settings/WirelessSettings.java | 16 ++++++++++ 7 files changed, 50 insertions(+), 27 deletions(-) diff --git a/assets/html/en_us/tethering_help.html b/assets/html/en_us/tethering_help.html index fa827d5ac4c..dfff70086d9 100644 --- a/assets/html/en_us/tethering_help.html +++ b/assets/html/en_us/tethering_help.html @@ -24,11 +24,11 @@ A {
  • You can't mount your phone's SD card on your computer when USB tethered

  • For more information, including using USB tethering with other OSs, see http://www.android.com/tether#usb

    • -

    Wi-Fi tethering

    -You can turn your phone into a Wi-Fi access point, to share your phone's internet connection with one or more computers or other devices +

    Portable Wi-Fi hotspot

    +You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices diff --git a/assets/html/en_us/tethering_wifi_help.html b/assets/html/en_us/tethering_wifi_help.html index cd8398d14a6..fac231b861d 100644 --- a/assets/html/en_us/tethering_wifi_help.html +++ b/assets/html/en_us/tethering_wifi_help.html @@ -17,11 +17,11 @@ A { -

    Wi-Fi tethering

    -You can turn your phone into a Wi-Fi access point, to share your phone's internet connection with one or more computers or other devices +

    Portable Wi-Fi hotspot

    +You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices diff --git a/res/values/strings.xml b/res/values/strings.xml index a0d3b4138fe..0560bfb6f8a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -889,23 +889,23 @@ - Wi-Fi tethering + Portable Wi-Fi hotspot - Access point %1$s active + Portable hotspot %1$s active - Wi-Fi tethering error + Portable Wi-Fi hotspot error - Wi-Fi tethering settings + Portable Wi-Fi hotspot settings - Set up & manage access point + Set up & manage portable Wi-Fi hotspot - Wi-Fi tethering settings + Portable Wi-Fi hotspot settings - Configure AP + Configure Wi-Fi hotspot - %1$s %2$s access point + %1$s %2$s portable Wi-Fi hotspot - AndroidAP + AndroidHotspot - Tethering + Tethering + Portable hotspot + Tethering & portable hotspot - Set up & manage tethering - - - Tethering settings + Share your phone\'s mobile data connection via USB + Share your phone\'s mobile connection as a portable Wi-Fi hotspot + Share your phone\'s mobile data connection via USB or as a portable Wi-Fi hotspot USB @@ -1428,7 +1429,7 @@ USB tethering error - Tethering help + Help Mobile networks diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml index b4ce7c3fe04..6e3d0624b3a 100644 --- a/res/xml/tether_prefs.xml +++ b/res/xml/tether_prefs.xml @@ -14,8 +14,7 @@ limitations under the License. --> - + + android:title="@string/tether_settings_title_both" + android:summary="@string/tether_settings_summary_both">