Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Side by Side Diff: chrome/app/generated_resources.grd

Issue 287103004: New avatar menu: For supervised users, show "(Supervised)" in the avatar button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: New mocks Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 7464 matching lines...) Expand 10 before | Expand all | Expand 10 after
7475 Saved |content settings| and #search engines# will not be cleared and ma y reflect your browsing habits. 7475 Saved |content settings| and #search engines# will not be cleared and ma y reflect your browsing habits.
7476 </message> 7476 </message>
7477 7477
7478 <!-- Managed User Avatar Menu --> 7478 <!-- Managed User Avatar Menu -->
7479 <message name="IDS_MANAGED_USER_INFO" desc="Text which explains that a sup ervised user is managed by a custodian."> 7479 <message name="IDS_MANAGED_USER_INFO" desc="Text which explains that a sup ervised user is managed by a custodian.">
7480 Usage and history of this user can be reviewed by the manager (<ph name= "CUSTODIAN_EMAIL">$1<ex>Jane.Doe@gmail.com</ex></ph>) on chrome.com. 7480 Usage and history of this user can be reviewed by the manager (<ph name= "CUSTODIAN_EMAIL">$1<ex>Jane.Doe@gmail.com</ex></ph>) on chrome.com.
7481 </message> 7481 </message>
7482 <message name="IDS_MANAGED_USER_AVATAR_LABEL" desc="A label for the superv ised user which is used in the avatar menu and as a label in the titlebar."> 7482 <message name="IDS_MANAGED_USER_AVATAR_LABEL" desc="A label for the superv ised user which is used in the avatar menu and as a label in the titlebar.">
7483 Supervised user 7483 Supervised user
7484 </message> 7484 </message>
7485 <message name="IDS_MANAGED_USER_NEW_AVATAR_LABEL" desc="A label for the su pervised user which is used in the new avatar menu, next to the username.">
7486 (Supervised)
7487 </message>
7485 7488
7486 <!-- Supervised User Block Interstitial data --> 7489 <!-- Supervised User Block Interstitial data -->
7487 <message name="IDS_BLOCK_INTERSTITIAL_TITLE" desc="A title for the supervi sed-user block interstitial page."> 7490 <message name="IDS_BLOCK_INTERSTITIAL_TITLE" desc="A title for the supervi sed-user block interstitial page.">
7488 Page blocked 7491 Page blocked
7489 </message> 7492 </message>
7490 <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE" desc="A message for the sup ervised user when they attempt to visit a site that is not permitted by the mana ger."> 7493 <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE" desc="A message for the sup ervised user when they attempt to visit a site that is not permitted by the mana ger.">
7491 Oops, looks like you need permission from <ph name="NAME">$1<ex>John Doe </ex></ph> to access this page. 7494 Oops, looks like you need permission from <ph name="NAME">$1<ex>John Doe </ex></ph> to access this page.
7492 </message> 7495 </message>
7493 <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED" de sc="A message for the supervised user when they attempt to visit a site that is not permitted by the manager (and they can't ask for permission)."> 7496 <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED" de sc="A message for the supervised user when they attempt to visit a site that is not permitted by the manager (and they can't ask for permission).">
7494 Oops, looks like you don't have permission to access this page. 7497 Oops, looks like you don't have permission to access this page.
(...skipping 6665 matching lines...) Expand 10 before | Expand all | Expand 10 after
14160 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode"> 14163 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode">
14161 Enforce (try to get hashes, and enforce them if successful) 14164 Enforce (try to get hashes, and enforce them if successful)
14162 </message> 14165 </message>
14163 14166
14164 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode"> 14167 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode">
14165 Enforce strict (hard fail if we can't get hashes) 14168 Enforce strict (hard fail if we can't get hashes)
14166 </message> 14169 </message>
14167 </messages> 14170 </messages>
14168 </release> 14171 </release>
14169 </grit> 14172 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698