summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-04-27 09:55:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-27 09:55:45 -0700
commit68389e75a5c01b77f068113803913e683ba39aac (patch)
tree566764fbb4e3792fbe0a98dc1475589fc49e84dd /res
parent9e264bf764e76b9f2821c8d609904ba3341ed038 (diff)
parent97617ce89e6f106f60a6ece48276a30b9fe8fdcc (diff)
downloadpackages_apps_Settings-68389e75a5c01b77f068113803913e683ba39aac.zip
packages_apps_Settings-68389e75a5c01b77f068113803913e683ba39aac.tar.gz
packages_apps_Settings-68389e75a5c01b77f068113803913e683ba39aac.tar.bz2
Merge "Allow p2p device rename" into jb-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f82f76..233b668 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1422,15 +1422,17 @@
<string name="wifi_p2p_peer_devices">Peer devices</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 -->
+ <string name="wifi_p2p_failed_rename_message">Failed to rename device.</string>
<!-- Title for disconnect dialog -->
<string name="wifi_p2p_disconnect_title">Disconnect?</string>
- <!-- Message test for disconnection from one device-->
+ <!-- Message text for disconnection from one device-->
<string name="wifi_p2p_disconnect_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> will end.</string>
- <!-- Message test for disconnection from multiple devices-->
+ <!-- Message text for disconnection from multiple devices-->
<string name="wifi_p2p_disconnect_multiple_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> and <xliff:g id="peer_count">%2$s</xliff:g> other devices will end.</string>
<!-- Title for cancel connect dialog -->
<string name="wifi_p2p_cancel_connect_title">Cancel invitation?</string>
- <!-- Message test for disconnection from one device-->
+ <!-- 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>
<!-- Wifi AP settings-->