String changes for sync dialog suggested by Brian.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6371007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72249 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -8154,13 +8154,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
         To sync passwords, <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> requires you to encrypt certain data using either your Google password or your own passphrase.
       </message>
       <message name="IDS_SYNC_PASSPHRASE_OPT_GOOGLE" desc="Radio button label for using Google password.">
-        Use my Google password.
+        Use my Google password
       </message>
       <message name="IDS_SYNC_PASSPHRASE_OPT_EXPLICIT" desc="Radio button label for using explicit passphrase.">
-        Choose my own passphrase.
+        Choose my own passphrase
       </message>
       <message name="IDS_SYNC_PASSPHRASE_OPT_CANCEL" desc="Radio button label for not syncing encrypted types.">
-        Do not sync my passwords.
+        Do not sync my passwords
       </message>
       <message name="IDS_SYNC_PASSPHRASE_MSG_GOOGLE" desc="Message when Google password is selected.">
         You have chosen to encrypt data using your Google password; you can always change your mind later by changing your sync settings.
@@ -8184,7 +8184,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Sign in again
       </message>
       <message name="IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL" desc="The label on a link that brings users to the Google Privacy Dashboard to control sync">
-        Control sync from Google Dashboard
+        Remove synced data on Google Dashboard
       </message>
       <message name="IDS_SYNC_CUSTOMIZE_BUTTON_LABEL" desc="The text to display on the button to customize which data types the user is syncing.">
         Customize...
@@ -8199,7 +8199,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Stop syncing this account
       </message>
       <message name="IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL" desc="The text to display below the 'Stop syncing this account' button on the options pane, explaining what the button does.">
-        Stopping <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> sync prevents sharing your <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> data from this computer.  All your data will remain within <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and your Google Account, but your Google Account will no longer receive changes to your <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> data.
+        If you stop syncing, the data stored on this computer as well as the data stored in your Google Account will remain in both places. However, new data or changes you make to your data will not be synchronized between them.
       </message>
       <!-- Sync time strings -->
       <message name="IDS_SYNC_TIME_NEVER" desc="Indicates that the first sync has never completed.">

chrome/browser/dom_ui/options/stop_syncing_handler.cc

@@ -24,8 +24,7 @@ void StopSyncingHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString("stop_syncing_explanation",
-      l10n_util::GetStringFUTF16(IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+      l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL));
   localized_strings->SetString("stop_syncing_title",
       l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_DIALOG_TITLE));
   localized_strings->SetString("stop_syncing_confirm",

chrome/browser/ui/cocoa/options/preferences_window_controller.mm

@@ -1395,9 +1395,8 @@ const int kDisabledIndex = 1;
         IDS_CANCEL)];
     [alert setMessageText:l10n_util::GetNSStringWithFixup(
         IDS_SYNC_STOP_SYNCING_DIALOG_TITLE)];
-    [alert setInformativeText:l10n_util::GetNSStringFWithFixup(
-        IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL,
-        l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))];
+    [alert setInformativeText:l10n_util::GetNSStringWithFixup(
+        IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL)];
     [alert setAlertStyle:NSWarningAlertStyle];
     const SEL kEndSelector =
         @selector(stopSyncAlertDidEnd:returnCode:contextInfo:);

chrome/browser/ui/gtk/options/content_page_gtk.cc

@@ -567,9 +567,8 @@ void ContentPageGtk::OnSyncStartStopButtonClicked(GtkWidget* widget) {
         GTK_MESSAGE_WARNING,
         GTK_BUTTONS_NONE,
         "%s",
-        l10n_util::GetStringFUTF8(
-            IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL,
-            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
+        l10n_util::GetStringUTF8(
+            IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL).c_str());
     gtk_util::ApplyMessageDialogQuirks(dialog);
     gtk_window_set_title(GTK_WINDOW(dialog),
                          l10n_util::GetStringUTF8(

chrome/browser/ui/views/options/content_page_view.cc

@@ -128,9 +128,8 @@ void ContentPageView::ButtonPressed(
       ConfirmMessageBoxDialog::RunWithCustomConfiguration(
           GetWindow()->GetNativeWindow(),
           this,
-          UTF16ToWide(l10n_util::GetStringFUTF16(
-              IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL,
-              l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))),
+          UTF16ToWide(l10n_util::GetStringUTF16(
+              IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL)),
           UTF16ToWide(l10n_util::GetStringUTF16(
               IDS_SYNC_STOP_SYNCING_DIALOG_TITLE)),
           UTF16ToWide(l10n_util::GetStringUTF16(