commit 47ba3b400ce90c8bb175f5b61fc71333bd7f62f5
author Akiya Utsumi <akiya.x.utsumi@sony.com> Wed Dec 27 21:43:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 27 21:43:20 2017 +0000
tree ff7706ce147b3afc05ea6f954b0253a89db3b631
parent 7e3fdede584241f5014baf1e9879c759cd9482a6
parent 985b432fc03e1cc80fe2a33bd325f3483009684a

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

Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9cbb85e..788c1ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1928,7 +1928,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] -->