diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-10 02:04:07 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-10 02:04:07 +0000 |
| commit | 202b5644a77bd7eb5ba5e912124f9e90236fd61f (patch) | |
| tree | 6675092604e167b54c3207722d2f24c1950e351b /chrome/app | |
| parent | 06c75029783496f78406bf6ce0d73de02b3124d4 (diff) | |
| download | chromium_src-202b5644a77bd7eb5ba5e912124f9e90236fd61f.zip chromium_src-202b5644a77bd7eb5ba5e912124f9e90236fd61f.tar.gz chromium_src-202b5644a77bd7eb5ba5e912124f9e90236fd61f.tar.bz2 | |
Now properly handles gaia passphrases changing.
Properly prompts the user to enter their previous GAIA passphrase as appropriate
if the user has changed their GAIA passphrase and there's still sync data on
the server encrypted with the old one.
BUG=95632,72381
TEST=sync auth test cases, including changing gaia passphrase
Review URL: http://codereview.chromium.org/7857021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 38fe31d..ed02805 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9955,6 +9955,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY" desc="Instructions for the dialog where the user needs to enter a different passphrase."> The passphrase you entered can't be used because you already have data encrypted with a passphrase. Please enter your existing sync passphrase below. </message> + <message name="IDS_SYNC_ENTER_GOOGLE_PASSPHRASE_BODY" desc="Instructions for the dialog where the user needs to enter their previous google passphrase."> + You already have data that is encrypted using a different version of your Google Account password. Please enter your previous Google Account password below. + </message> <message name="IDS_SYNC_PASSPHRASE_LABEL" desc="Label for the passphrase field."> Passphrase </message> |