diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 18:58:44 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 18:58:44 +0000 |
| commit | 4b2866b35e1d220636b5b732ba78b1d9fe6e385e (patch) | |
| tree | 60fc20098dc142ee005e71eb5e12574ce84da4e2 /chrome/app | |
| parent | 864e1b6cae0e473fc086d8c7e7a9287856dcd6a2 (diff) | |
| download | chromium_src-4b2866b35e1d220636b5b732ba78b1d9fe6e385e.zip chromium_src-4b2866b35e1d220636b5b732ba78b1d9fe6e385e.tar.gz chromium_src-4b2866b35e1d220636b5b732ba78b1d9fe6e385e.tar.bz2 | |
From the enter-passphrase screen in sync setup, canceling should only disable encrypted sync, not all sync. Show a confirmation dialog for the same and ignore future passphrase warnings that are decryption-related, as long as encrypted datatypes are not being used.
BUG=60182
TEST=see bug
Review URL: http://codereview.chromium.org/6364009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 095396f..b36218c 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8366,6 +8366,19 @@ Keep your key file in a safe place. You will need it to create new versions of y If you've forgotten your passphrase, stop and reset Sync via the Google Dashboard. </message> + <message name="IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER" desc="Header for the passphrase cancel warning. Should be phrased as a yes-or-no question."> + Skip password sync? + </message> + <message name="IDS_SYNC_PASSPHRASE_CANCEL_WARNING" desc="Warning message when the passphrase entry is canceled."> + Without a passphrase, your passwords will not be synced on this computer. You can enable password sync by changing your sync settings and entering your passphrase. + </message> + <message name="IDS_SYNC_PASSPHRASE_CANCEL_YES" desc="String for 'yes' button on passphrase cancel warning dialog."> + Skip password sync + </message> + <message name="IDS_SYNC_PASSPHRASE_CANCEL_NO" desc="String for 'no' button on passphrase cancel warning dialog."> + Enter passphrase + </message> + <!-- Login dialog strings --> <message name="IDS_SYNC_MY_BOOKMARKS_LABEL" desc="Title of the sync login dialog."> Set up sync |