PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev

Browse Source 
* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
This commit is contained in:
Amith Yamasani
2013-03-29 18:56:30 -07:00
committed by Android Git Automerger
parent 419b49882a 26aca80eb1
commit 377002fa1a
4 changed files with 152 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/values/strings.xml
View File

@@ -4427,6 +4427,27 @@
<string name="user_restrictions_title">Allow apps and content</string>
<!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
<string name="user_rename">RENAME</string>
<!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
<string name="app_restrictions_custom_label">Set application limits</string>
<!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
<string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>
<!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
<string name="restriction_wifi_config_summary">Allow modification of Wi\u2011Fi and Mobile settings</string>
<!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
<string name="restriction_bluetooth_config_title">Bluetooth</string>
<!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
<string name="restriction_bluetooth_config_summary">Allow modification of Bluetooth pairings and settings</string>
<!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
<string name="restriction_nfc_enable_title">NFC</string>
<!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
<string name="restriction_nfc_enable_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
<!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
<string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
<!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
<string name="restriction_location_enable_title">NFC</string>
<!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
<string name="restriction_location_enable_summary" >Let apps use your location information</string>
<!-- Wizard back button label [CHAR LIMIT=25] -->
<string name="wizard_back">Back</string>