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

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

Issue 783963002: Tray message changed for child accounts. Warning bubble removed for child accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Inline temporarily removed. Created 6 years 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
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="chromeos">. --> 3 Everything in this file is wrapped in <if expr="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 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook."> 7 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook.">
8 Chromebook 8 Chromebook
9 </message> 9 </message>
10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox"> 10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox">
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 </message> 1681 </message>
1682 <message name="IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE" desc="Text shown next to progress indicator upon supervised user creation."> 1682 <message name="IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE" desc="Text shown next to progress indicator upon supervised user creation.">
1683 Creating supervised user 1683 Creating supervised user
1684 </message> 1684 </message>
1685 <message name="IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE" d esc="Text shown at the place of progess indicator if creation takes too long and should be cancelled."> 1685 <message name="IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE" d esc="Text shown at the place of progess indicator if creation takes too long and should be cancelled.">
1686 This is taking much longer than usual. You can keep waiting, or cancel and t ry again later. 1686 This is taking much longer than usual. You can keep waiting, or cancel and t ry again later.
1687 </message> 1687 </message>
1688 <message name="IDS_USER_IS_SUPERVISED_BY_NOTICE" desc="Text for notifications showing that this user is supervised"> 1688 <message name="IDS_USER_IS_SUPERVISED_BY_NOTICE" desc="Text for notifications showing that this user is supervised">
1689 Usage and history of this user can be reviewed by the manager (<ph name="MAN AGER_EMAIL">$1<ex>user@example.com</ex></ph>) on chrome.com. 1689 Usage and history of this user can be reviewed by the manager (<ph name="MAN AGER_EMAIL">$1<ex>user@example.com</ex></ph>) on chrome.com.
1690 </message> 1690 </message>
1691 <message name="IDS_CHILD_USER_IS_MANAGED_BY_ONE_PARENT_NOTICE" desc="Text for notifications showing that this child user is managed by parent's account.">
1692 This is an account for kids managed by <ph name="MANAGER_EMAIL">$1<ex>user@e xample.com</ex></ph>
1693 </message>
1694 <message name="IDS_CHILD_USER_IS_MANAGED_BY_TWO_PARENTS_NOTICE" desc="Text for notifications showing that this child user is managed by two parents' accounts. ">
1695 This is an account for kids managed by <ph name="FIRST_PARENT_EMAIL">$1<ex>f irst@example.com</ex></ph> and <ph name="SECOND_PARENT_EMAIL">$2<ex>second@examp le.com</ex></ph>
1696 </message>
1691 <message name="IDS_SUPERVISED_USER_EXPIRED_TOKEN_WARNING" desc="Warning text t hat is shown on login screen trying to sign in as a supervised user that has exp ired token"> 1697 <message name="IDS_SUPERVISED_USER_EXPIRED_TOKEN_WARNING" desc="Warning text t hat is shown on login screen trying to sign in as a supervised user that has exp ired token">
1692 This supervised user may have been deleted or disabled by the manager. Pleas e contact the manager if you would like to continue signing in as this user. 1698 This supervised user may have been deleted or disabled by the manager. Pleas e contact the manager if you would like to continue signing in as this user.
1693 </message> 1699 </message>
1694 <message name="IDS_SUPERVISED_USER_IMPORT_USER_EXIST" desc="In list of supervi sed users eligible for import, this text indicates that user already is already imported on device."> 1700 <message name="IDS_SUPERVISED_USER_IMPORT_USER_EXIST" desc="In list of supervi sed users eligible for import, this text indicates that user already is already imported on device.">
1695 <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> (already on this device) 1701 <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> (already on this device)
1696 </message> 1702 </message>
1697 <message name="IDS_SUPERVISED_USER_IMPORT_USERNAME_EXIST" desc="In list of sup ervised users eligible for import, this text indicates that another supervised u ser with same name already exists on device."> 1703 <message name="IDS_SUPERVISED_USER_IMPORT_USERNAME_EXIST" desc="In list of sup ervised users eligible for import, this text indicates that another supervised u ser with same name already exists on device.">
1698 <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> (name used on this device) 1704 <ph name="USER_DISPLAY_NAME">$1<ex>John</ex></ph> (name used on this device)
1699 </message> 1705 </message>
1700 <message name="IDS_SUPERVISED_USER_IMPORT_BUBBLE_TEXT" desc="Text shown in not ification bubble when user enters name of user that can be imported."> 1706 <message name="IDS_SUPERVISED_USER_IMPORT_BUBBLE_TEXT" desc="Text shown in not ification bubble when user enters name of user that can be imported.">
(...skipping 4244 matching lines...) Expand 10 before | Expand all | Expand 10 after
5945 <message name="IDS_SET_TIME_BUTTON_CLOSE" desc="Text for the button to close t he window."> 5951 <message name="IDS_SET_TIME_BUTTON_CLOSE" desc="Text for the button to close t he window.">
5946 Done 5952 Done
5947 </message> 5953 </message>
5948 <message name="IDS_SET_TIME_DATE_LABEL" desc="Label for the date input element ."> 5954 <message name="IDS_SET_TIME_DATE_LABEL" desc="Label for the date input element .">
5949 System date 5955 System date
5950 </message> 5956 </message>
5951 <message name="IDS_SET_TIME_TIME_LABEL" desc="Label for the time input element ."> 5957 <message name="IDS_SET_TIME_TIME_LABEL" desc="Label for the time input element .">
5952 System time 5958 System time
5953 </message> 5959 </message>
5954 </grit-part> 5960 </grit-part>
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698