Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
97ed6faa70
@@ -639,8 +639,8 @@
|
||||
<string name="settings_shortcut">Settings shortcut</string>
|
||||
<!-- Wireless controls settings screen, setting check box label -->
|
||||
<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. -->
|
||||
<string name="radio_controls_title">NFC & more</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] -->
|
||||
<string name="radio_controls_title">More</string>
|
||||
<!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
|
||||
<string name="wireless_networks_settings_title">Wireless & networks</string>
|
||||
<!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
|
||||
@@ -1640,7 +1640,7 @@
|
||||
|
||||
<string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
|
||||
<!-- Message informing the user how to turn off [CHAR LIMIT=200] -->
|
||||
<string name="wifi_scan_always_turnoff_message">To thurn this off, go to Advanced in the overflow menu.</string>
|
||||
<string name="wifi_scan_always_turnoff_message">To turn this off, go to Advanced in the overflow menu.</string>
|
||||
<string name="wifi_scan_always_confirm_allow">Allow</string>
|
||||
<string name="wifi_scan_always_confirm_deny">Deny</string>
|
||||
|
||||
|
Reference in New Issue
Block a user