Fix strings

Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cc2bb44..48af683 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1218,9 +1218,9 @@
     <!-- Generic error message when the sleep policy could not be set. -->
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
     <!-- Checkbox title for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations">Power save</string>
+    <string name="wifi_suspend_optimizations">Wi-Fi optimization</string>
     <!-- Checkbox summary for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations_summary">Save power when screen is turned off</string>
+    <string name="wifi_suspend_optimizations_summary">Minimize battery usage when Wi-Fi is on</string>
     <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
     <string name="wifi_add_network">Add network</string>
     <!-- Header for the list of wifi networks-->
@@ -1460,10 +1460,8 @@
     <string name="wifi_p2p_cancel_connect_title">Cancel invitation?</string>
     <!-- Message text for disconnection from one device-->
     <string name="wifi_p2p_cancel_connect_message">Do you want to cancel invitation to connect with <xliff:g id="peer_name">%1$s</xliff:g>?</string>
-    <!-- Title for delete group dialog -->
-    <string name="wifi_p2p_delete_group_title">Delete group?</string>
     <!-- Message text for remembered group deletion-->
-    <string name="wifi_p2p_delete_group_message">Do you want to delete the group <xliff:g id="group_name">%1$s</xliff:g>?</string>
+    <string name="wifi_p2p_delete_group_message">Forget this group?</string>
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 1bb253a..2496d8e 100644 (file)
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -444,8 +444,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             int stringId = R.string.wifi_p2p_delete_group_message;
 
             AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.wifi_p2p_delete_group_title)
-                .setMessage(getActivity().getString(stringId, mSelectedGroup.getGroupName()))
+                .setMessage(getActivity().getString(stringId))
                 .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDeleteGroupListener)
                 .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
                 .create();