diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-19 09:57:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 09:57:33 -0700 |
| commit | 8addf86c3c122c5f0783fd61dbd8568b8393a2ee (patch) | |
| tree | 6ccbf54a68ef431de132b40cf44a7eda06de528b /res/values | |
| parent | b11b9abf95a4badeb3d037ffe8e882f622a453d2 (diff) | |
| parent | 536c3d7651d0e37b13b5ee655c215207a39dff7d (diff) | |
| download | packages_apps_settings-8addf86c3c122c5f0783fd61dbd8568b8393a2ee.zip packages_apps_settings-8addf86c3c122c5f0783fd61dbd8568b8393a2ee.tar.gz packages_apps_settings-8addf86c3c122c5f0783fd61dbd8568b8393a2ee.tar.bz2 | |
Merge "Add Nsd settings checkbox"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6361510..fae54ae 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1157,6 +1157,12 @@ <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] --> <string name="android_beam_explained">When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts, and more.\n\nJust bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed.</string> + <!-- Network service discovery settings --> + <!-- Used in the 1st-level settings screen to turn on NSD --> + <string name="nsd_quick_toggle_title">Network service discovery</string> + <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] --> + <string name="nsd_quick_toggle_summary">Allow apps on other devices to discover apps on this device</string> + <!-- Wi-Fi Settings --> <skip /> <!-- Used in the 1st-level settings screen to turn on Wi-Fi --> <string name="wifi_quick_toggle_title">Wi-Fi</string> |