| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 8bef99bf612b9fedc1d90c532fd37cb53e0f7e88..09f5f6d70b8e4c4eaef5471c5ce61062b9e2d41d 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -6312,6 +6312,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION" desc="Description for the flag to disable new design for OOBE / sign in flows.">
|
| Disables new design for OOBE / sign in flows.
|
| </message>
|
| + <message name="IDS_FLAGS_DISABLE_FACTORY_RESET" desc="Name of the experimental option that resets the device to its factory state.">
|
| + Disable factory reset.
|
| + </message>
|
| + <message name="IDS_FLAGS_DISABLE_FACTORY_RESET_DESCRIPTION" desc="Description of the experimental option that resets the device to its factory state.">
|
| + Disables factory reset shortcut and window on login wizard and options dialog.
|
| + </message>
|
| <message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION" desc="Name for the flag to disable wallpaper boot animation (except for OOBE).">
|
| Disable boot animation.
|
| </message>
|
| @@ -9965,6 +9971,21 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"
|
| Check for server certificate revocation
|
| </message>
|
|
|
| + <if expr="pp_ifdef('chromeos')">
|
| + <message name="IDS_OPTIONS_FACTORY_RESET" desc="Name of the factory reset option on the chrome settings page">
|
| + Factory Reset
|
| + </message>
|
| + <message name="IDS_OPTIONS_FACTORY_RESET_DESCRIPTION" desc="Description of the factory reset option on the chrome settings page">
|
| + Reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device to its original factory state.
|
| + </message>
|
| + <message name="IDS_OPTIONS_FACTORY_RESET_BUTTON" desc="Name of the button to activate the factory reset option on the chrome settings page">
|
| + Reset
|
| + </message>
|
| + <message name="IDS_OPTIONS_FACTORY_RESET_WARNING" desc="Warning text in the 'Factory Reset' window">
|
| + A restart is required in order to reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device to its original factory state.
|
| + </message>
|
| + </if>
|
| +
|
| <message name="IDS_OPTIONS_MANAGE_DATA_DESCRIPTION" desc="The title of the 'Manage your data' label.">
|
| Manage your data
|
| </message>
|
| @@ -14115,6 +14136,9 @@ Press any key to continue exploring.
|
| <message name="IDS_EULA_SCREEN_TITLE" desc="Title of the OOBE EULA screen">
|
| The small print
|
| </message>
|
| + <message name="IDS_RESET_SCREEN_TITLE" desc="Title of the reset screen">
|
| + Factory reset
|
| + </message>
|
| <message name="IDS_UPDATE_SCREEN_TITLE" desc="Title of the OOBE update screen">
|
| Update
|
| </message>
|
| @@ -15220,6 +15244,16 @@ Press any key to continue exploring.
|
| Trusted Platform Module (TPM) chip is disabled or absent.
|
| </message>
|
|
|
| + <message name="IDS_RESET_SCREEN_WARNING_MSG" desc="Warning text shown on reset screen above the exclamation icon.">
|
| + Factory Reset your <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> device
|
| + </message>
|
| + <message name="IDS_RESET_SCREEN_WARNING_DETAILS" desc="Warning text shown on reset screen below the exclamation icon.">
|
| + Your device will be reset into its original factory state. All local files and media will be erased. Would you like to continue?
|
| + </message>
|
| + <message name="IDS_RESET_SCREEN_RESET" desc="Reset button text">
|
| + Reset
|
| + </message>
|
| +
|
| <message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Tooltip for options managed by enterprise policy">
|
| This option is controlled by enterprise policy. Please contact your administrator for more information.
|
| </message>
|
|
|