Further tweaks to the passphrase UI to deal with passphrase entry....

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
===================================================================
--- chrome/app/generated_resources.grd	(revision 71271)
+++ chrome/app/generated_resources.grd	(working copy)
@@ -8624,7 +8624,7 @@
         Sync
       </message>
       <message name="IDS_SYNC_NTP_SYNC_SECTION_ERROR_TITLE" desc="The title to display in the New Tab Page sync status section in case of an error.">
-        Sync needs your attention!
+        Sync needs your attention
       </message>
       <message name="IDS_SYNC_NTP_SYNC_SECTION_PROMO_TITLE" desc="The title to display in the New Tab Page sync status section in case of a promotion.">
 	New!
@@ -8711,10 +8711,10 @@
 	Use a sync passphrase to encrypt my data
       </message>
       <message name="IDS_SYNC_PASSPHRASE_WARNING" desc="Warning message about using a passphrase for sync.">
-	You are currently using a passphrase.  If you have forgotten your passphrase, you can reset sync to clear your synced data from Google's servers using the Google Privacy Dashboard.
+	You are currently using a passphrase.  If you have forgotten your passphrase, you can reset sync to clear your synced data from Google's servers using the Google Dashboard.
       </message>
       <message name="IDS_SYNC_CLEAR_DATA_LINK" desc="Link to the Google Dashboard.">
-	Go to Google Privacy Dashboard
+	Visit the Google Dashboard
       </message>
 
       <!-- Passphrase dialog strings -->
@@ -8722,8 +8722,11 @@
 	Enter your passphrase
       </message>
       <message name="IDS_SYNC_ENTER_PASSPHRASE_BODY" desc="Instructions for the dialog where the user enters the passphrase.">
-	Your sync data has been encrypted using a passphrase.  Please enter your passphrase to decrypt the data.
+	You already have data that is encrypted with a custom passphrase, please enter it below.
       </message>
+      <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 custom passphrase. Please enter your existing passphrase below.
+      </message>
       <message name="IDS_SYNC_PASSPHRASE_LABEL" desc="Label for the passphrase field.">
 	Passphrase:
       </message>
@@ -8736,7 +8739,13 @@
       <message name="IDS_SYNC_PASSPHRASE_MISMATCH_ERROR" desc="Error message when the passphrase and confirmation don't match.">
 	You must enter the same passphrase twice.
       </message>
-
+      <message name="IDS_SYNC_INCORRECT_PASSPHRASE" desc="Message when the passphrase is incorrect.">
+	The passphrase you entered is incorrect.
+      </message>
+      <message name="IDS_SYNC_PASSPHRASE_RECOVER" desc="Message about how to recover from a lost passphrase.">
+	If you've forgotten your passphrase, stop and reset Sync via the Google Dashboard.
+      </message>
+	
       <!-- Login dialog strings -->
       <message name="IDS_SYNC_MY_BOOKMARKS_LABEL" desc="Title of the sync login dialog.">
         Set up sync