| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 4b670a6b8e6e47df6523b0614d2aecf97318c5af..d9f30dce3d7a25745daa59cbf43c3465e791355d 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -14383,6 +14383,22 @@ Do you accept?
|
| Share
|
| </message>
|
|
|
| + <message name="IDS_REMEMBER_CERTIFICATE_ERROR_DECISION_CHOICE_DO_NOT_REMEMBER">
|
| + Do not remember
|
| + </message>
|
| + <message name="IDS_REMEMBER_CERTIFICATE_ERROR_DECISION_CHOICE_ONE_DAY">
|
| + Remember for one day
|
| + </message>
|
| + <message name="IDS_REMEMBER_CERTIFICATE_ERROR_DECISION_CHOICE_THREE_DAYS">
|
| + Remember for three days
|
| + </message>
|
| + <message name="IDS_REMEMBER_CERTIFICATE_ERROR_DECISION_CHOICE_ONE_WEEK">
|
| + Remember for one week
|
| + </message>
|
| + <message name="IDS_REMEMBER_CERTIFICATE_ERROR_DECISION_CHOICE_ONE_MONTH">
|
| + Remember for one month
|
| + </message>
|
| +
|
| <!-- Zero suggest experiment flags -->
|
| <if expr="is_android">
|
| <message name="IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_NAME" desc="An about:flags experiment for zero suggest">
|
| @@ -14555,6 +14571,14 @@ Do you accept?
|
| <message name="IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT" desc="Question asked on the info bar whenever a domain wants to send push messages">
|
| notifications
|
| </message>
|
| +
|
| + <!-- Invalid SSL certificate memory strategy strings -->
|
| + <message name="IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_NAME" desc="Name of the remember certificate error decisions lab">
|
| + Remember certificate error decisions
|
| + </message>
|
| + <message name="IDS_FLAGS_REMEMBER_CERTIFICATE_ERROR_DECISIONS_DESCRIPTION" desc="Description of the remember certificate error decisions lab">
|
| + Remember decisions to proceed through SSL errors for a specified length of time.
|
| + </message>
|
| </messages>
|
| </release>
|
| </grit>
|
|
|