summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJessica Hummel <jhummel@google.com>2014-08-22 14:26:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-22 14:26:56 +0000
commitf9220b39533d18b6c79099c32522b3ff712ff89b (patch)
tree0d66c1e569c4cdb855a3203f2923b431c6a9ceb7 /core
parent91d065bcbfa0223d2fc2be8f3bba70a77fcb9355 (diff)
parent36b4e35a005dd2886e60370504230378a0eab856 (diff)
downloadframeworks_base-f9220b39533d18b6c79099c32522b3ff712ff89b.zip
frameworks_base-f9220b39533d18b6c79099c32522b3ff712ff89b.tar.gz
frameworks_base-f9220b39533d18b6c79099c32522b3ff712ff89b.tar.bz2
Merge "Final strings tweaks for work profile" into lmp-dev
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b198329..bbbe1ae 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3958,7 +3958,7 @@
<string name="permission_request_notification_with_subtitle">Permission requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>
<!-- Message to show when an intent automatically switches users into the personal profile. -->
- <string name="forward_intent_to_owner">You\'re using this app in your personal profile</string>
+ <string name="forward_intent_to_owner">You\'re using this app outside of your work profile</string>
<!-- Message to show when an intent automatically switches users into a work profile. -->
<string name="forward_intent_to_work">You\'re using this app in your work profile</string>
@@ -4325,7 +4325,7 @@
<!-- Text for the toast that is shown when the user clicks on a launcher that
doesn't support the work profile. [CHAR LIMIT=100] -->
- <string name="activity_resolver_work_profiles_support">%1$s doesn\'t support work profile.</string>
+ <string name="activity_resolver_work_profiles_support">%1$s doesn\'t support work profile</string>
<!-- Name of the default audio route for tablets when nothing
is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
@@ -4821,7 +4821,7 @@
<string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
<!--
- Used to wrap a label for content description for a managed profile, e.g. "Work Email" instead
+ Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
of email when there are two email apps.
[CHAR LIMIT=20]
-->