am 33806e72: Merge "Change title to "Wi-Fi network"" into jb-dev

* commit '33806e72b03c763333723c0d4df50de9140a6e09':
  Change title to "Wi-Fi network"
This commit is contained in:
Russell Brenner
2012-05-10 09:26:22 -07:00
committed by Android Git Automerger

View File

@@ -1180,7 +1180,7 @@
<!-- Summary text of the Wi-fi settings screen --> <!-- Summary text of the Wi-fi settings screen -->
<string name="wifi_settings_summary">Set up &amp; manage wireless access points</string> <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
<!-- Used in the 1st-level settings screen to turn on Wi-Fi [CHAR LIMIT=NONE] --> <!-- Used in the 1st-level settings screen to turn on Wi-Fi [CHAR LIMIT=NONE] -->
<string name="wifi_setup_wizard_title">Select Wi-Fi network</string> <string name="wifi_setup_wizard_title">Wi-Fi network</string>
<!-- Summary text when turning Wi-Fi or bluetooth on --> <!-- Summary text when turning Wi-Fi or bluetooth on -->
<string name="wifi_starting">Turning Wi-Fi on\u2026</string> <string name="wifi_starting">Turning Wi-Fi on\u2026</string>
<!-- Summary text when turning Wi-Fi or bluetooth off --> <!-- Summary text when turning Wi-Fi or bluetooth off -->