diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 6e1b2b8..03b2e90 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -646,6 +646,7 @@ <item>get usage stats</item> <item>mute/unmute microphone</item> <item>project media</item> + <item>activate VPN</item> </string-array> <!-- User display names for app ops codes --> @@ -696,6 +697,7 @@ <item>Get usage stats</item> <item>Mute/unmute microphone</item> <item>Project media</item> + <item>Activate VPN</item> </string-array> <!-- Titles for the list of long press timeout options. --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8e2551e..317e6ca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3339,8 +3339,6 @@ <string name="input_methods_settings_title">Text input</string> <!-- Setting name for Input Method chooser --> <string name="input_method">Input method</string> - <!-- Title for the option to press to enable or disable keyboards, also known as input methods [CHAR LIMIT=35] --> - <string name="choose_input_methods">Choose Keyboards</string> <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] --> <string name="current_input_method">Current Keyboard</string> <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] --> @@ -3431,6 +3429,8 @@ <string name="allow_mock_location">Allow mock locations</string> <!-- setting Checkbox summary whether to allow mock locations --> <string name="allow_mock_location_summary">Allow mock locations</string> + <!-- Setting Checkbox title whether to enable view attribute inspection --> + <string name="debug_view_attributes">Enable view attribute inspection</string> <!-- Title of warning dialog about the implications of enabling USB debugging --> <string name="adb_warning_title">Allow USB debugging?</string> <!-- Warning text to user about the implications of enabling USB debugging --> @@ -4432,9 +4432,9 @@ following operations:</string> <!-- Title for screen to set a profile owner [CHAR LIMIT=40] --> - <string name="profile_owner_add_title">Profile owner</string> + <string name="profile_owner_add_title">Activate Profile Manager?</string> <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] --> - <string name="adding_profile_owner_warning" translatable="false">This application wants to assume COMPLETE control of this user, including restricting critical operations. Only allow this if you trust this application.</string> + <string name="adding_profile_owner_warning">By proceeding, your User will be managed by your Administrator which may also be able to store associated data, in addition to your personal data.\n\nYour Administrator has the ability to monitor and manage settings, access, apps, and data associated with this User, including network activity and your device\’s location information.</string> <!-- Name to assign to a Network Access Point that was saved without a name --> <string name="untitled_apn">Untitled</string> |