Merge "Fix the format of wifi_carrier_content string" am: 985b432fc0 am: 47ba3b400c

am: 9dffb28afd

Change-Id: I90004b044b4217ad0c102e9afde1f491826d6a4f
This commit is contained in:
Akiya Utsumi
2017-12-27 21:52:05 +00:00
committed by android-build-merger

View File

@@ -1951,7 +1951,7 @@
<!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->
<string name="wifi_carrier_connect">Carrier Wi\u2011Fi network</string>
<!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1%s</xliff:g></string>
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
<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] -->