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

Side by Side Diff: chrome/app/chromeos_strings.grdp

Issue 22856002: Add string for case when supervised user creation is disabled due to "only these users can log in" … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes Created 7 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/screen_gaia_signin.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- ChromeOS-specific strings (included from generated_resources.grd). 2 <!-- ChromeOS-specific strings (included from generated_resources.grd).
3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. --> 3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->
4 <grit-part> 4 <grit-part>
5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required."> 5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required.">
6 </message> 6 </message>
7 <!-- Idle logout dialog for retail mode --> 7 <!-- Idle logout dialog for retail mode -->
8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only."> 8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only.">
9 Are you still there? 9 Are you still there?
10 </message> 10 </message>
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 </message> 464 </message>
465 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME" desc="Title close to icon shown on side of Google sign-in UI to create a supervised user."> 465 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME" desc="Title close to icon shown on side of Google sign-in UI to create a supervised user.">
466 Supervised user 466 Supervised user
467 </message> 467 </message>
468 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_HTML" desc="Text with actual link shown on side of Google sign-in UI to create a supervised user."> 468 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_HTML" desc="Text with actual link shown on side of Google sign-in UI to create a supervised user.">
469 <ph name="LINK_START">$1<ex>&gt;a&lt;</ex></ph>Create a supervised user<ph name="LINK_END">$2<ex>&gt;/a&lt;</ex></ph> for this device. 469 <ph name="LINK_START">$1<ex>&gt;a&lt;</ex></ph>Create a supervised user<ph name="LINK_END">$2<ex>&gt;/a&lt;</ex></ph> for this device.
470 </message> 470 </message>
471 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text sho wn when supervised user can be created, but no users that can be manager exist." > 471 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text sho wn when supervised user can be created, but no users that can be manager exist." >
472 At least one account must exist on this device before creating a supervised user. 472 At least one account must exist on this device before creating a supervised user.
473 </message> 473 </message>
474 <message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT" desc= "Text shown when supervised user can be created, but owner of the device restric ted managed user creation or whitelist has been enabled for this device.">
475 Creation of supervised users is restricted by the owner of this device.
476 </message>
474 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE" desc="Supervised u ser dialog, intro page, title"> 477 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE" desc="Supervised u ser dialog, intro page, title">
475 What is a supervised user? 478 What is a supervised user?
476 </message> 479 </message>
477 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_ALTERNATE_TEXT" desc="Supervis ed user dialog, intro page, first paragraph"> 480 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_ALTERNATE_TEXT" desc="Supervis ed user dialog, intro page, first paragraph">
478 A supervised user can explore the web with your guidance. As the manager of a supervised user, you can 481 A supervised user can explore the web with your guidance. As the manager of a supervised user, you can
479 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>allow or prohibit<ph name="END_BOLD ">&lt;/strong&gt;</ph> certain websites, 482 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>allow or prohibit<ph name="END_BOLD ">&lt;/strong&gt;</ph> certain websites,
480 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>review<ph name="END_BOLD">&lt;/stro ng&gt;</ph> websites the supervised user has visited, and 483 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>review<ph name="END_BOLD">&lt;/stro ng&gt;</ph> websites the supervised user has visited, and
481 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>manage<ph name="END_BOLD">&lt;/stro ng&gt;</ph> other settings. 484 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>manage<ph name="END_BOLD">&lt;/stro ng&gt;</ph> other settings.
482 </message> 485 </message>
483 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1" desc="Supervised user dialog, intro page, first paragraph"> 486 <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_1" desc="Supervised user dialog, intro page, first paragraph">
(...skipping 3286 matching lines...) Expand 10 before | Expand all | Expand 10 after
3770 You are currently connected to the <ph name="NETWORK_TYPE">$1<ex>cellular</e x></ph> network. 3773 You are currently connected to the <ph name="NETWORK_TYPE">$1<ex>cellular</e x></ph> network.
3771 </message> 3774 </message>
3772 <message name="IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED" desc="Status label: for updates you need to connect to an Ethernet or Wi-Fi"> 3775 <message name="IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED" desc="Status label: for updates you need to connect to an Ethernet or Wi-Fi">
3773 To check for updates, please use Ethernet or Wi-Fi. 3776 To check for updates, please use Ethernet or Wi-Fi.
3774 </message> 3777 </message>
3775 <message name="IDS_UPGRADE_NETWORK_LIST_CELLULAR_DISALLOWED" desc="Status labe l: for updates you need to connect to an Ethernet, mobile data or Wi-Fi"> 3778 <message name="IDS_UPGRADE_NETWORK_LIST_CELLULAR_DISALLOWED" desc="Status labe l: for updates you need to connect to an Ethernet, mobile data or Wi-Fi">
3776 To check for updates, please use Ethernet, Wi-Fi or mobile data. 3779 To check for updates, please use Ethernet, Wi-Fi or mobile data.
3777 </message> 3780 </message>
3778 3781
3779 </grit-part> 3782 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/screen_gaia_signin.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698