| Index: chrome/browser/ui/webui/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| index 6b925996f42609cf1f506d85acab4bc70006fb3f..feb8f1ee2fbb4b2b0efddf8cef8bcfa023f01568 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| @@ -242,11 +242,9 @@ void SyncSetupHandler::GetStaticLocalizedValues(
|
| static OptionsStringResource resources[] = {
|
| { "syncSetupOverlayTitle", IDS_SYNC_SETUP_TITLE },
|
| { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE },
|
| - { "signinPrefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX },
|
| - { "signinSuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX },
|
| { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK },
|
| - { "emailLabel", IDS_SYNC_LOGIN_EMAIL },
|
| - { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD },
|
| + { "emailLabel", IDS_SYNC_LOGIN_EMAIL_NEW_LINE },
|
| + { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD_NEW_LINE },
|
| { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS },
|
| { "signin", IDS_SYNC_SIGNIN },
|
| { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT },
|
| @@ -255,9 +253,11 @@ void SyncSetupHandler::GetStaticLocalizedValues(
|
| { "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL },
|
| { "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT },
|
| { "createAccount", IDS_SYNC_CREATE_ACCOUNT },
|
| + { "createAccountPrefix", IDS_SYNC_CREATE_ACCOUNT_PREFIX },
|
| { "cancel", IDS_CANCEL },
|
| { "settingUp", IDS_SYNC_LOGIN_SETTING_UP },
|
| { "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN },
|
| + { "signinHeader", IDS_SYNC_PROMO_SIGNIN_HEADER},
|
| { "captchaInstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS },
|
| { "invalidAccessCode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL },
|
| { "enterAccessCode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL },
|
|
|