summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-02 05:54:28 +0000
committernoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-02 05:54:28 +0000
commit9d19aaea6d0198583357cbb8f49d6fb77991371d (patch)
tree9a75c2b6a9ef3bef1dc757e536b3fd6b301a0275
parentaf2521c1b71a773058299cfee61ebd472fe32e54 (diff)
downloadchromium_src-9d19aaea6d0198583357cbb8f49d6fb77991371d.zip
chromium_src-9d19aaea6d0198583357cbb8f49d6fb77991371d.tar.gz
chromium_src-9d19aaea6d0198583357cbb8f49d6fb77991371d.tar.bz2
Fix strings used by the desktop User Manager
The desktop user manager is moving to using "person" instead of "user" for all the things. BUG=287883 Review URL: https://codereview.chromium.org/422063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287158 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd46
1 files changed, 33 insertions, 13 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c81a6966..60524fc 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13537,32 +13537,52 @@ After you create a new supervised user, you can manage their settings at any tim
<if expr="not is_android and not is_ios">
<!-- User manager web UI -->
<if expr="use_titlecase">
- <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
- Add User
- </message>
+ <if expr="not chromeos">
+ <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
+ Add Person
+ </message>
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
+ Remove This Person
+ </message>
+ </if>
+ <if expr="chromeos">
+ <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
+ Add User
+ </message>
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
+ Remove This User
+ </message>
+ </if>
<message name="IDS_SCREEN_LOCK_SIGN_OUT">
Sign out
</message>
<message name="IDS_LOGIN_BUTTON">
Sign in
</message>
- <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
- Remove This User
- </message>
</if>
<if expr="not use_titlecase">
- <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
- Add user
- </message>
+ <if expr="not chromeos">
+ <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
+ Add person
+ </message>
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
+ Remove this person
+ </message>
+ </if>
+ <if expr="chromeos">
+ <message name="IDS_ADD_USER_BUTTON" desc="Text shown on an add user button on login/locker screen">
+ Add user
+ </message>
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
+ Remove this user
+ </message>
+ </if>
<message name="IDS_SCREEN_LOCK_SIGN_OUT">
Sign out
</message>
<message name="IDS_LOGIN_BUTTON">
Sign in
</message>
- <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON" desc="Text shown on a button that confirms removal of a user.">
- Remove this user
- </message>
</if>
<if expr="chromeos">
<message name="IDS_LAUNCH_APP_BUTTON" desc="Text shown on the button that launches kiosk app from Chrome OS login UI">
@@ -13612,7 +13632,7 @@ After you create a new supervised user, you can manage their settings at any tim
See what's new
</message>
<message name="IDS_USER_MANAGER_TUTORIAL_SKIP" desc="Text of the button that stops the tutorial">
- Skip for now
+ Skip
</message>
<message name="IDS_USER_MANAGER_TUTORIAL_NEXT" desc="Text of the button that advances the tutorial to the next slide">
Next