am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '300457bad289f547430da21e72747e8840840832':
  Enable to delete a stored persistent group from p2p settings.
This commit is contained in:
Jean-Baptiste Queru
2012-08-28 11:15:22 -07:00
committed by Android Git Automerger
3 changed files with 125 additions and 1 deletions

View File

@@ -1442,6 +1442,8 @@
<string name="wifi_p2p_menu_rename">Rename device</string>
<!-- Title for available p2p devices -->
<string name="wifi_p2p_peer_devices">Peer devices</string>
<!-- Title for remembered p2p groups -->
<string name="wifi_p2p_remembered_groups">Remembered groups</string>
<!-- Toast text for a failed connection initiation -->
<string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string>
<!-- Message text for failure to rename -->
@@ -1456,6 +1458,10 @@
<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>
<!-- Wifi AP settings-->
<!-- Label for wifi tether checkbox. Toggles Access Point on/off -->