Chromium Code Reviews| Index: components/supervised_user_error_page_strings.grdp |
| diff --git a/components/supervised_user_error_page_strings.grdp b/components/supervised_user_error_page_strings.grdp |
| index 1bc73f5601ffd00d94fab6a0dcc80bfbc31b0525..8094db94919281db388cfd377cd5498858246506 100644 |
| --- a/components/supervised_user_error_page_strings.grdp |
| +++ b/components/supervised_user_error_page_strings.grdp |
| @@ -2,19 +2,19 @@ |
| <grit-part> |
| <!-- Supervised User Block Interstitial data --> |
| <message name="IDS_BLOCK_INTERSTITIAL_TITLE" desc="A title for the supervised-user block interstitial page."> |
| - Page blocked |
| + Site blocked |
|
Marc Treib
2016/11/08 16:33:44
Apparently we now use "site" instead of "page"; I'
|
| </message> |
| - <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE" desc="A message for the supervised user when they attempt to visit a site that is not permitted by the manager."> |
| - Oops! You need permission from <ph name="NAME">$1<ex>John Doe</ex></ph> to access this page. |
| + <message name="IDS_CHILD_BLOCK_INTERSTITIAL_HEADER" desc="A heading for the message to the child user when they attempt to visit a site that is not permitted by their parent."> |
| + Ask your parent |
| </message> |
| - <message name="IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT" desc="A message for the child user when they attempt to visit a site that is not permitted by their parent."> |
| - Oops! You need to ask your parent if it's OK to visit this page. |
| + <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE" desc="A message for the supervised user when they attempt to visit a site that is not permitted by the manager."> |
| + You need permission from <ph name="NAME">$1<ex>John Doe</ex></ph> to visit this site. |
| </message> |
| - <message name="IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT" desc="A message for the child user when they attempt to visit a site that is not permitted by their parents."> |
| - Oops! You need to ask your parents if it's OK to visit this page. |
| + <message name="IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE" desc="A message for the child user when they attempt to visit a site that is not permitted by their parent."> |
| + Looks like you need permission to visit this site. |
| </message> |
| <message name="IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED" desc="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)."> |
| - Oops, looks like you don't have permission to access this page. |
| + Looks like you don't have permission to visit this site. |
| </message> |
| <message name="IDS_BACK_BUTTON" desc="A button for going back to the last safe url after being blocked."> |
| Go back |
| @@ -22,9 +22,6 @@ |
| <message name="IDS_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON" desc="A button for requesting access to blocked sites."> |
| Ask permission |
| </message> |
| - <message name="IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON" desc="A button for requesting access to blocked sites."> |
|
Marc Treib
2016/11/08 16:33:44
Unused, and anyway identical to the one above.
|
| - Ask permission |
| - </message> |
| <message name="IDS_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE" desc="The text that tells the supervised user that a request has been sent."> |
| Your request to access this site has been sent to <ph name="NAME">$1<ex>John Doe</ex></ph>. |
| </message> |
| @@ -32,10 +29,10 @@ |
| Your request to access this site could not be sent to <ph name="NAME">$1<ex>John Doe</ex></ph>. Please try again. |
| </message> |
| <message name="IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_SINGLE_PARENT" desc="The text that tells the child user that a request has been sent to their parent."> |
| - You asked your parent if it's ok to visit this page. |
| + You asked your parent if it's OK to visit this site. |
|
Marc Treib
2016/11/08 16:33:44
I think we decided at some point that capitalized
|
| </message> |
| <message name="IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_SENT_MESSAGE_MULTI_PARENT" desc="The text that tells the child user that a request has been sent to their parents."> |
| - You asked your parents if it's ok to visit this page. |
| + You asked your parents if it's OK to visit this site. |
| </message> |
| <message name="IDS_CHILD_BLOCK_INTERSTITIAL_REQUEST_FAILED_MESSAGE_SINGLE_PARENT" desc="The text that tells the child user that a request to their parent failed."> |
| We could not reach your parent at the moment. Please try again. |
| @@ -52,35 +49,29 @@ |
| <message name="IDS_BLOCK_INTERSTITIAL_HIDE_DETAILS" desc="The text for the link to hide details about the interstitial."> |
| Hide details |
| </message> |
| + <message name="IDS_SUPERVISED_USER_BLOCK_HEADER" desc="Header for the message to be shown when a site was blocked."> |
| + This site is blocked |
| + </message> |
| <message name="IDS_CHILD_BLOCK_MESSAGE_DEFAULT_SINGLE_PARENT" desc="Message to be shown when a site was blocked due to the default fallback behavior and the child has one parent."> |
| - You're seeing this message because your parent needs to approve new sites on your first visit. |
| + Your parent hasn't approved it yet. |
| </message> |
| <message name="IDS_CHILD_BLOCK_MESSAGE_DEFAULT_MULTI_PARENT" desc="Message to be shown when a site was blocked due to the default fallback behavior and the child has two parents."> |
| - You're seeing this message because your parents need to approve new sites on your first visit. |
| + Your parents haven't approved it yet. |
| </message> |
| <message name="IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT" desc="Message to be show to a supervised user when a site was blocked due to the default fallback behaviour."> |
| - You're seeing this message because your manager needs to approve new sites on your first visit. |
| - </message> |
| - <message name="IDS_SUPERVISED_USER_BLOCK_HEADER_DEFAULT" desc="Header for the message to be shown when a site was blocked due to the default fallback behaviour."> |
| - Not approved |
| + Your manager hasn't approved it yet. |
| </message> |
| - <message name="IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES" desc="Message to be shown when a site was blocked due to the SafeSites safety check."> |
| - You're seeing this message because Google SafeSites is enabled. |
| - </message> |
| - <message name="IDS_SUPERVISED_USER_BLOCK_HEADER_SAFE_SITES" desc="Header for the message to be shown when a site was blocked due to the SafeSites safety check."> |
| - SafeSites |
| + <message name="IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES" desc="Message to be shown when a site was blocked due to the SafeSites safety check."> |
| + It may have mature content. |
| </message> |
| <message name="IDS_CHILD_BLOCK_MESSAGE_MANUAL_SINGLE_PARENT" desc="Message to be shown to a child when a site was blocked due to a manual blacklist entry and the child has one parent."> |
| - You're seeing this message because your parent blocked this site. |
| + Your parent can unblock it for you. |
| </message> |
| <message name="IDS_CHILD_BLOCK_MESSAGE_MANUAL_MULTI_PARENT" desc="Message to be shown to a child when a site was blocked due to a manual blacklist entry and the child has two parents."> |
| - You're seeing this message because one of your parents blocked this site. |
| + Your parents can unblock it for you. |
| </message> |
| <message name="IDS_SUPERVISED_USER_BLOCK_MESSAGE_MANUAL" desc="Message to be shown to a supervised user when a site is blocked due to a manual blacklist entry"> |
| - You're seeing this message because your manager blocked this site. |
| - </message> |
| - <message name="IDS_SUPERVISED_USER_BLOCK_HEADER_MANUAL" desc="Header for the message to be shown when a site was blocked due to a manual blacklist entry."> |
| - Blocked |
| + Your manager can unblock it for you. |
| </message> |
| </grit-part> |