Revert 102834 - Revert 102806 - [Sync Setup UI] String changes. "Sync" -> "Sign In" and others.

chrome/browser/ui/webui/options/personal_options_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 41 matching lines @@
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "personalPage",
                 IDS_OPTIONS_CONTENT_TAB_LABEL);
 
 
   localized_strings->SetString(
       "syncOverview",
       l10n_util::GetStringFUTF16(IDS_SYNC_OVERVIEW,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-  localized_strings->SetString(
-      "syncFurtherOverview",
-      l10n_util::GetStringUTF16(IDS_SYNC_FURTHER_OVERVIEW));
   localized_strings->SetString("syncSection",
       l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME));
   localized_strings->SetString("customizeSync",
       l10n_util::GetStringUTF16(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL));
+  localized_strings->SetString("syncLearnMoreURL",
+      google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL));
 
   localized_strings->SetString("profiles",
       l10n_util::GetStringUTF16(IDS_PROFILES_OPTIONS_GROUP_NAME));
   localized_strings->SetString("profilesCreate",
       l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_BUTTON_LABEL));
   localized_strings->SetString("profilesManage",
       l10n_util::GetStringUTF16(IDS_PROFILES_MANAGE_BUTTON_LABEL));
   localized_strings->SetString("profilesDelete",
       l10n_util::GetStringUTF16(IDS_PROFILES_DELETE_BUTTON_LABEL));
   localized_strings->SetString("profilesListItemCurrent",
@@ skipping 160 matching lines @@
     is_start_stop_button_visible = true;
 #endif  // defined(OS_CHROMEOS)
     is_start_stop_button_enabled = !managed;
   } else if (service->SetupInProgress()) {
     start_stop_button_label =
         l10n_util::GetStringUTF16(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
     is_start_stop_button_visible = true;
     is_start_stop_button_enabled = false;
   } else {
     start_stop_button_label =
-        l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
+        l10n_util::GetStringFUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL,
+                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
     is_start_stop_button_visible = true;
     is_start_stop_button_enabled = !managed;
   }
 
   scoped_ptr<Value> completed(Value::CreateBooleanValue(sync_setup_completed));
   web_ui_->CallJavascriptFunction("PersonalOptions.setSyncSetupCompleted",
                                   *completed);
 
   scoped_ptr<Value> label(Value::CreateStringValue(status_label));
   web_ui_->CallJavascriptFunction("PersonalOptions.setSyncStatus", *label);
@@ skipping 123 matching lines @@
     profile_info_list.Append(profile_value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }