Merge "Revert "Rename more to other networks"" into nyc-dev

am: fd91887

* commit 'fd918873110586911ea7dd3cab526088114fed7e':
  Revert "Rename more to other networks"

Change-Id: I022c8d2570b1c6d1e9ce58328048e4354e2114ae
This commit is contained in:
Jason Monk
2016-03-30 16:35:49 +00:00
committed by android-build-merger

View File

@@ -591,7 +591,7 @@
<!-- Wireless controls settings screen, setting check box label --> <!-- Wireless controls settings screen, setting check box label -->
<string name="airplane_mode">Airplane mode</string> <string name="airplane_mode">Airplane mode</string>
<!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. [CHAR LIMIT=30] --> <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. [CHAR LIMIT=30] -->
<string name="radio_controls_title">Other networks</string> <string name="radio_controls_title">More</string>
<!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. --> <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
<string name="wireless_networks_settings_title">Wireless &amp; networks</string> <string name="wireless_networks_settings_title">Wireless &amp; networks</string>
<!-- Main Settings screen settings summary text for the "Wireless controls" setting --> <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->