| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 6a7b0e9144e79ed5947004e04c9386bdf5da29f2..d2ff13d3b5eeaa8aa11fdaef5561d97fe22f0c60 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -8071,17 +8071,34 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
|
| Clearing...
|
| </message>
|
|
|
| + <!--Managed mode passphrase dialog data -->
|
| + <message name="IDS_PASSPHRASE_TITLE" desc="A title for the passphrase page to unlock managed user settings.">
|
| + Unlock
|
| + </message>
|
| + <message name="IDS_PASSPHRASE_INSTRUCTION" desc="Instruction to enter an unlock passphrase to unlock managed user settings.">
|
| + Enter passphrase to unlock managed user settings.
|
| + </message>
|
| + <message name="IDS_UNLOCK_PASSPHRASE_BUTTON" desc="A button for unlocking the managed user settings page.">
|
| + Unlock
|
| + </message>
|
| + <message name="IDS_FORGOT_PASSPHRASE" desc="A link to recover forgotten passphrase.">
|
| + Forgot passphrase?
|
| + </message>
|
| + <message name="IDS_INCORRECT_PASSPHRASE_WARNING" desc="A warning for the passphrase page if the incorrect passphrase was entered.">
|
| + The passphrase you entered is incorrect.
|
| + </message>
|
| +
|
| <!-- Managed User Settings dialog data -->
|
| - <message name="IDS_MANAGED_USER_SETTINGS_TITLE" desc="Title for the Managed User Settings dialog">
|
| + <message name="IDS_MANAGED_USER_SETTINGS_TITLE" desc="Title for the Managed User Settings dialog.">
|
| Managed User Settings
|
| </message>
|
| - <message name="IDS_INSTALLED_CONTENT_PACKS_LABEL" desc="Label for installed whitelists on the Managed User Settings dialog">
|
| + <message name="IDS_INSTALLED_CONTENT_PACKS_LABEL" desc="Label for installed whitelists on the Managed User Settings dialog.">
|
| Installed and enabled content packs:
|
| </message>
|
| <message name="IDS_GET_CONTENT_PACKS_BUTTON" desc="The text for the button that opens the webstore, Content pack section.">
|
| Get Content Packs
|
| </message>
|
| - <message name="IDS_CONTENT_PACK_SETTINGS_LABEL" desc="Label that explains the three options associated with installed whitelists on the Managed User Settings dialog">
|
| + <message name="IDS_CONTENT_PACK_SETTINGS_LABEL" desc="Label that explains the three options associated with installed whitelists on the Managed User Settings dialog.">
|
| When a managed user tries to access a site that is not in any content pack:
|
| </message>
|
| <message name="IDS_OUTSIDE_CONTENT_PACKS_ALLOW_RADIO" desc="A radio button in the Managed User Settings dialog for allowing a managed user to view sites that do not belong to the installed whitelists.">
|
| @@ -8096,7 +8113,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
|
| <message name="IDS_ADVANCED_MANAGED_USER_LABEL" desc="A label in the Managed User Settings dialog for other managed user settings.">
|
| Advanced settings
|
| </message>
|
| - <message name="IDS_SAFE_SEARCH_ENABLED" desc="A checkbox in the Managed User Settings dialog for enabling SafeSearch">
|
| + <message name="IDS_SAFE_SEARCH_ENABLED" desc="A checkbox in the Managed User Settings dialog for enabling SafeSearch.">
|
| Enable Google's SafeSearch
|
| </message>
|
| <message name="IDS_SIGNIN_SYNC_DISABLED" desc="A checkbox in the Managed User Settings dialog for disabling sign in or sync.">
|
| @@ -8108,9 +8125,27 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
|
| <message name="IDS_USE_PASSPHRASE_LABEL" desc="A checkbox in the Managed User Settings dialog to set whether to ask for a passphrase to access other profiles.">
|
| Use a passphrase to leave managed mode
|
| </message>
|
| - <message name="IDS_SET_PASSPHRASE_BUTTON" desc="A button in the Managed User Settings dialog to set the passphrase to access other profiles">
|
| + <message name="IDS_SET_PASSPHRASE_BUTTON" desc="A button in the Managed User Settings dialog to set the passphrase to access other profiles.">
|
| Set passphrase
|
| </message>
|
| + <message name="IDS_SET_PASSPHRASE_TITLE" desc="A title for the Managed User Set Passphrase dialog.">
|
| + Set a passphrase
|
| + </message>
|
| + <message name="IDS_SET_PASSPHRASE_INSTRUCTIONS" desc="XXX">
|
| + Set a passphrase to access managed user settings and other profiles.
|
| + </message>
|
| + <message name="IDS_ENTER_PASSPHRASE_LABEL" desc="A label for entering a passphrase to save.">
|
| + Enter a passphrase:
|
| + </message>
|
| + <message name="IDS_CONFIRM_PASSPHRASE_LABEL" desc="A label for re-entering a passphrase to save.">
|
| + Confirm the passphrase:
|
| + </message>
|
| + <message name="IDS_PASSPHRASE_MISMATCH" desc="A warning message which is displayed when the passphrase entered as confirmation does not match the passphrase.">
|
| + The passphrases do not match.
|
| + </message>
|
| + <message name="IDS_SAVE_PASSPHRASE_BUTTON" desc="A button label for saving the passhrase to lock a managed mode user.">
|
| + Save
|
| + </message>
|
|
|
| <!-- Managed Mode Block Interstitial data -->
|
| <message name="IDS_BLOCK_INTERSTITIAL_TITLE" desc="A title for the managed mode block interstitial page.">
|
|
|