summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 13:53:41 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 13:53:41 +0000
commit585a00130e9c38574659791ebac49ee7bd483793 (patch)
tree74ecfca011b3e7b788e75fd1b891da0f04021411 /chrome/app
parentf8967f4ca86e0303385ca2276902f5db5bb25a4f (diff)
downloadchromium_src-585a00130e9c38574659791ebac49ee7bd483793.zip
chromium_src-585a00130e9c38574659791ebac49ee7bd483793.tar.gz
chromium_src-585a00130e9c38574659791ebac49ee7bd483793.tar.bz2
Revert 53989 - Implement new mock for user options page per chromium-os:5028
BUG=chromium-os:5028 TEST=Verify the user options page matches mock per chromium-os:5028. Note the underlying libcros is still missing and UI shows up mock data only. Review URL: http://codereview.chromium.org/2868067 TBR=xiyuan@chromium.org Review URL: http://codereview.chromium.org/3074010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 418cf89..d29b9ae 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5483,7 +5483,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Labs
</message>
<message name="IDS_OPTIONS_ACCOUNTS_TAB_LABEL" desc="The title of the Accounts tab">
- Users
+ Accounts
</message>
</if>
<message name="IDS_OPTIONS_GENERAL_TAB_LABEL" desc="The title of the Basics tab">
@@ -7891,19 +7891,19 @@ Keep your key file in a safe place. You will need it to create new versions of y
Allow browse without signing in.
</message>
<message name="IDS_OPTIONS_ACCOUNTS_ALLOW_GUEST_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to allow guest to sign in.">
- Allow anyone to sign in.
+ Allow guest signin.
</message>
- <message name="IDS_OPTIONS_ACCOUNTS_SHOW_USER_NAMES_ON_SINGIN_DESCRIPTION" desc="In the Accounts settings tab, the text on the checkbox to show user names and pictures on signin screen.">
- Show user names and pictures on sign-in screen.
+ <message name="IDS_OPTIONS_ACCOUNTS_USER_LIST_TITLE" desc="In the Accounts settings tab, the title text on top of user list table.">
+ Users
</message>
- <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT" desc="In the Accounts settings tab, the instruction text on an empty username edit.">
- Enter names or addresses.
+ <message name="IDS_OPTIONS_ACCOUNTS_ADD_USER" desc="In the Accounts settings tab, the text on the button to add a user.">
+ Add user
</message>
- <message name="IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT" desc="In the Accounts settings tab, the text format to create user name and owner tag.">
- <ph name="NAME">$1<ex>John Doe</ex></ph> - Owner
+ <message name="IDS_OPTIONS_ACCOUNTS_REMOVE_USER" desc="In the Accounts settings tab, the text on the button to remove a user.">
+ Remove user
</message>
- <message name="IDS_OPTIONS_ACCOUNTS_ADD_USERS" desc="In the Accounts settings tab, the label text above the user name edit box.">
- Add users
+ <message name="IDS_OPTIONS_ACCOUNTS_EMAIL_LABEL" desc="In the Accounts add user overlay, the label text for email input edit.">
+ Email:
</message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID" desc="In settings internet options, the label for the network id.">
Network id: