Removed personalization_strings.h and moved all the strings into generated_resources.grd.

I'll take care of the Setup Wizard strings/resources in my next patch. 

BUG=none
TEST=none

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

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

10 files changed, 160 insertions, 123 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9a767a5..fd2b102 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2359,6 +2359,9 @@ each locale. -->
       <message name="IDS_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
         Close
       </message>
+      <message name="IDS_ACCNAME_SYNC_ERROR_BUTTON" desc="The accessible name for the sync error button on the bookmarks bar.">
+        Sync Error - please relogin
+      </message>
 
       <!-- Browser Hung Plugin Detector -->
       <message name="IDS_UNKNOWN_PLUGIN_NAME" desc="Name for a plugin whose name could not be determined">
@@ -4503,6 +4506,95 @@ each locale. -->
         Type your search query here
       </message>
 
+      <!-- Sync strings -->
+
+      <!-- Sync options dialog strings -->
+      <message name="IDS_SYNC_OPTIONS_GROUP_NAME" desc="The name of the sync group in the options dialog.">
+        Bookmark Sync:
+      </message>
+      <message name="IDS_SYNC_NOT_SET_UP_INFO" desc="The message that appears in the options dialog when sync has not been set up by the user.">
+        You are not set up to sync your bookmarks with your other computers.
+      </message>
+      <message name="IDS_SYNC_START_SYNC_BUTTON_LABEL" desc="The label that appears on the sync button in the options dialog when sync has not been set up by the user.">
+        Synchronize my bookmarks...
+      </message>
+      <message name="IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME" desc="The message that appears in the options dialog indicating that account is synced to a user with the given email address. The last sync also appears in the message.">
+        Synced to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>\nLast synced: <ph name="LAST_SYNC_TIME">$2<ex>12 seconds ago</ex></ph>
+      </message>
+      <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials.">
+        Account login details are not yet entered.
+      </message>
+      <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync.">
+        Authenticating...
+      </message>
+      <message name="IDS_SYNC_INVALID_USER_CREDENTIALS" desc="Error message to display when the user name or password entered by the user are invalid.">
+        Invalid user name or password.
+      </message>
+      <message name="IDS_SYNC_ERROR_SIGNING_IN" desc="An error was encountered while signing the user in.">
+        Error signing in.
+      </message>
+      <message name="IDS_SYNC_LOGIN_INFO_OUT_OF_DATE" desc="The login information for the user is out of date - for example, the user changed their password and therefore a re-login is required.">
+        Login details are out of date.
+      </message>
+      <message name="IDS_SYNC_SERVER_IS_UNREACHABLE" desc="The message to disaplay in the New Tab Page sync section when the server is unreachable.">
+        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex> could not sync your bookmarks because it could not connect to the sync server. Retrying...</ph>
+      </message>
+      <message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to relogin to use sync.">
+        Login again
+      </message>
+      <message name="IDS_SYNC_STOP_SYNCING_BUTTON_LABEL" desc="The text to display on the button to indicate stop syncing functionality.">
+        Stop syncing this account
+      </message>
+
+      <!-- Sync time strings -->
+      <message name="IDS_SYNC_TIME_NEVER" desc="Indicates that the first sync has never completed.">
+        Never
+      </message>
+      <message name="IDS_SYNC_TIME_JUST_NOW" desc="Indicates that a sync cycle just finished.">
+        Just now
+      </message>
+
+      <!-- Sync New Tab Page strings -->
+      <message name="IDS_SYNC_NTP_SYNC_SECTION_TITLE" desc="The title of the sync status section in the New Tab Page.">
+        Bookmark 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.">
+        Bookmark Sync Error!
+      </message>
+      <message name="IDS_SYNC_NTP_PROMOTION_MESSAGE" desc="The New Tab Page sync promotion message to display in the sync status section.">
+        You can sync your bookmarks across computers using your Google account
+      </message>
+      <message name="IDS_SYNC_NTP_START_NOW_LINK_LABEL" desc="The label to display for the New Tab Page promotion link.">
+        Start now
+      </message>
+      <message name="IDS_SYNC_NTP_SETUP_IN_PROGRESS" desc="The message to display in the New Tab Page sync section when the sync setup is underway.">
+        Setup in progress...
+      </message>
+      <message name="IDS_SYNC_NTP_SYNCED_TO" desc="The message to display in the New Tab Page sync section when the user is in sync.">
+        Synced to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>
+      </message>
+      <message name="IDS_SYNC_NTP_VIEW_ONLINE_LINK" desc="The message to display in the New Tab Page link inside the sync section which allows the user to view the synced data online.">
+        View in Google Docs
+      </message>
+
+      <!-- Sync menu item strings -->
+      <message name="IDS_SYNC_MENU_LABEL" desc="Text to show in the menu item for bookmark sync.">
+        Sync my bookmarks...
+      </message>
+
+      <!-- Login dialog strings -->
+      <message name="IDS_SYNC_LOGIN_DIALOG_TITLE" desc="The title of the sync login dialog.">
+        Sync my bookmarks
+      </message>
+
+      <!-- Bookmarks bar strings -->
+      <message name="IDS_SYNC_BOOKMARK_BAR_ERROR" desc="The text to display on the bookmark bar button which indicates a sync error.">
+        Sync Error
+      </message>
+      <message name="IDS_SYNC_BOOKMARK_BAR_ERROR_DESC" desc="The detailed description of the error to associate with the bookmark bar error button.">
+        Your login details are out of date. Click to re-enter your password.
+      </message>
+
       <!-- Mac Menubar Menus -->
       <if expr="os == 'darwin'">
         <!-- Menubar Menu Titles -->
diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
index 7b8fd39..0b26492 100644
--- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
+++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc
@@ -6,19 +6,27 @@
 
 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
 
+#include "app/l10n_util.h"
 #include "base/json_writer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 
+// Default URL for the sync web interface.
+//
+// TODO(idana): when we figure out how we are going to allow third parties to
+// plug in their own sync engine, we should allow this value to be
+// configurable.
+static const char kSyncDefaultViewOnlineUrl[] = "http://docs.google.com";
+
 // TODO(idana): the following code was originally copied from
 // toolbar_importer.h/cc and it needs to be moved to a common Google Accounts
 // utility.
@@ -111,8 +119,9 @@ void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
   if (!sync_service_->HasSyncSetupCompleted() &&
       !sync_service_->SetupInProgress()) {
     if (IsGoogleGAIACookieInstalled()) {
-      SendSyncMessageToPage(SyncStatusUIHelper::PRE_SYNCED, kSyncPromotionMsg,
-                            kStartNowLinkText);
+      SendSyncMessageToPage(SyncStatusUIHelper::PRE_SYNCED,
+          WideToUTF8(l10n_util::GetString(IDS_SYNC_NTP_PROMOTION_MESSAGE)),
+          WideToUTF8(l10n_util::GetString(IDS_SYNC_NTP_START_NOW_LINK_LABEL)));
     } else {
       HideSyncStatusSection();
     }
@@ -160,7 +169,9 @@ void NewTabPageSyncHandler::SendSyncMessageToPage(
     std::string linktext) {
   DictionaryValue value;
   std::string msgtype;
-  std::string title = kSyncSectionTitle;
+  std::wstring user;
+  std::string title =
+      WideToUTF8(l10n_util::GetString(IDS_SYNC_NTP_SYNC_SECTION_TITLE));
   std::string linkurl;
   switch (type) {
     case SyncStatusUIHelper::PRE_SYNCED:
@@ -168,12 +179,16 @@ void NewTabPageSyncHandler::SendSyncMessageToPage(
       break;
     case SyncStatusUIHelper::SYNCED:
       msgtype = "synced";
-      linktext = kSyncViewOnlineLinkLabel;
-      linkurl = kSyncViewOnlineLinkUrl;
-      msg = msg.substr(0, msg.find(WideToUTF8(kLastSyncedLabel)));
+      linktext =
+          WideToUTF8(l10n_util::GetString(IDS_SYNC_NTP_VIEW_ONLINE_LINK));
+      linkurl = kSyncDefaultViewOnlineUrl;
+      user = UTF16ToWide(sync_service_->GetAuthenticatedUsername());
+      msg = WideToUTF8(l10n_util::GetStringF(IDS_SYNC_NTP_SYNCED_TO, user));
       break;
     case SyncStatusUIHelper::SYNC_ERROR:
-      title = kSyncErrorSectionTitle;
+      title =
+          WideToUTF8(
+              l10n_util::GetString(IDS_SYNC_NTP_SYNC_SECTION_ERROR_TITLE));
       msgtype = "error";
       break;
   }
diff --git a/chrome/browser/sync/personalization_strings.h b/chrome/browser/sync/personalization_strings.h
deleted file mode 100644
index 08204a0..0000000
--- a/chrome/browser/sync/personalization_strings.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// Contains all string resources usec by the personalization module.
-
-// TODO(munjal): This file should go away once the personalization module
-// becomes public. At that point, we have to put all the strings below in the
-// generated resources file.
-
-#ifdef CHROME_PERSONALIZATION
-
-// TODO(timsteele): Rename this file; 'personalization' is deprecated.
-#ifndef CHROME_BROWSER_SYNC_PERSONALIZATION_STRINGS_H_
-#define CHROME_BROWSER_SYNC_PERSONALIZATION_STRINGS_H_
-
-// Options dialog strings.
-static const wchar_t kSyncGroupName[] = L"Bookmark Sync:";
-static const wchar_t kSyncNotSetupInfo[] =
-    L"You are not set up to sync your bookmarks with your other computers.";
-static const wchar_t kStartSyncButtonLabel[] = L"Synchronize my bookmarks...";
-static const wchar_t kSyncAccountLabel[] = L"Synced to ";
-static const wchar_t kLastSyncedLabel[] = L"Last synced: ";
-static const wchar_t kSyncCredentialsNeededLabel[] =
-    L"Account login details are not yet entered.";
-static const wchar_t kSyncAuthenticatingLabel[] = L"Authenticating...";
-static const wchar_t kSyncInvalidCredentialsError[] =
-    L"Invalid user name or password.";
-static const wchar_t kSyncOtherLoginErrorLabel[] =
-    L"Error signing in.";
-static const wchar_t kSyncExpiredCredentialsError[] =
-    L"Login details are out of date.";
-static const wchar_t kSyncServerNotReachableError[] =
-    L"Sync server is not reachable. Retrying...";
-static const wchar_t kSyncReLoginLinkLabel[] = L"Login again";
-static const wchar_t kStopSyncButtonLabel[] = L"Stop syncing this account";
-
-// Sync status messages.
-static const wchar_t kLastSyncedTimeNever[] = L"Never.";
-static const wchar_t kLastSyncedTimeWithinLastMinute[] = L"Just now.";
-
-// Various strings for the new tab page personalization.
-static const char kSyncSectionTitle[] = "Bookmark Sync";
-static const char kSyncErrorSectionTitle[] = "Bookmark Sync Error!";
-static const char kSyncPromotionMsg[] =
-    "You can sync your bookmarks across computers using your Google account.";
-static const wchar_t kSyncServerUnavailableMsg[] =
-    L"Google Chrome could not sync your bookmarks because it could not connect "
-    L"to the sync server. Retrying...";
-static const char kStartNowLinkText[] = "Start now";
-static const char kSettingUpText[] = "Setup in progress...";
-
-// TODO(idana): when we get rid of this file and move all the strings into
-// generated_resources.grd, we should probably move these into a pref of some
-// sort to allow third party sync providers to control which URL to use for the
-// sync web UI. We should also make it possible for the sync provider to hide
-// the link altogether if they don't provide web UI for their users.
-static const char kSyncViewOnlineLinkUrl[] = "http://docs.google.com";
-static const char kSyncViewOnlineLinkLabel[] = "View in Google Docs";
-
-// Sync menu item strings.
-static const wchar_t kMenuLabelStartSync[] = L"Sync my bookmarks...";
-
-// Login dialog strings.
-static const wchar_t kLoginDialogTitle[] = L"Sync my bookmarks";
-
-// Bookmark bar strings.
-static const wchar_t kBookmarkBarSyncErrorButtonText[] = L"Sync Error";
-static const wchar_t kBookmarkBarErrorTooltip[] =
-    L"Your login details are out of date. Click to re-enter your password.";
-
-#endif  // CHROME_BROWSER_SYNC_PERSONALIZATION_STRINGS_H_
-
-#endif  // CHROME_PERSONALIZATION
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 0690273..9eb2acc 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -8,6 +8,7 @@
 #include <stack>
 #include <vector>
 
+#include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ -22,13 +23,13 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/time_format.h"
+#include "grit/generated_resources.h"
 #include "views/window/window.h"
 
 using browser_sync::ChangeProcessor;
@@ -308,12 +309,12 @@ std::wstring ProfileSyncService::BuildSyncStatusSummaryText(
 
 std::wstring ProfileSyncService::GetLastSyncedTimeString() const {
   if (last_synced_time_.is_null())
-    return kLastSyncedTimeNever;
+    return l10n_util::GetString(IDS_SYNC_TIME_NEVER);
 
   base::TimeDelta last_synced = base::Time::Now() - last_synced_time_;
 
   if (last_synced < base::TimeDelta::FromMinutes(1))
-    return kLastSyncedTimeWithinLastMinute;
+    return l10n_util::GetString(IDS_SYNC_TIME_JUST_NOW);
 
   return TimeFormat::TimeElapsed(last_synced);
 }
diff --git a/chrome/browser/sync/sync_status_ui_helper.cc b/chrome/browser/sync/sync_status_ui_helper.cc
index d16068f..0e7f721 100644
--- a/chrome/browser/sync/sync_status_ui_helper.cc
+++ b/chrome/browser/sync/sync_status_ui_helper.cc
@@ -6,10 +6,12 @@
 
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 
+#include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/auth_error_state.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 // Given an authentication state, this helper function returns the appropriate
 // status message and, if necessary, the text that should appear in the
@@ -18,23 +20,27 @@ static void GetLabelsForAuthError(AuthErrorState auth_error,
     ProfileSyncService* service, std::wstring* status_label,
     std::wstring* link_label) {
   if (link_label)
-    link_label->assign(kSyncReLoginLinkLabel);
+    link_label->assign(l10n_util::GetString(IDS_SYNC_RELOGIN_LINK_LABEL));
   if (auth_error == AUTH_ERROR_INVALID_GAIA_CREDENTIALS) {
     // If the user name is empty then the first login failed, otherwise the
     // credentials are out-of-date.
     if (service->GetAuthenticatedUsername().empty())
-      status_label->append(kSyncInvalidCredentialsError);
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_INVALID_USER_CREDENTIALS));
     else
-      status_label->append(kSyncExpiredCredentialsError);
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
   } else if (auth_error == AUTH_ERROR_CONNECTION_FAILED) {
     // Note that there is little the user can do if the server is not
     // reachable. Since attempting to re-connect is done automatically by
     // the Syncer, we do not show the (re)login link.
-    status_label->append(kSyncServerUnavailableMsg);
+    status_label->assign(
+        l10n_util::GetStringF(IDS_SYNC_SERVER_IS_UNREACHABLE,
+                              l10n_util::GetString(IDS_PRODUCT_NAME)));
     if (link_label)
       link_label->clear();
   } else {
-    status_label->append(kSyncOtherLoginErrorLabel);
+    status_label->assign(l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN));
   }
 }
 
@@ -47,12 +53,8 @@ static std::wstring GetSyncedStateStatusLabel(ProfileSyncService* service) {
   if (user_name.empty())
     return label;
 
-  label += kSyncAccountLabel;
-  label += user_name;
-  label += L"\n";
-  label += kLastSyncedLabel;
-  label += service->GetLastSyncedTimeString();
-  return label;
+  return l10n_util::GetStringF(IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
+                               user_name, service->GetLastSyncedTimeString());
 }
 
 // static
@@ -72,7 +74,7 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
       status_label->assign(GetSyncedStateStatusLabel(service));
       DCHECK_EQ(auth_error, AUTH_ERROR_NONE);
     } else if (service->UIShouldDepictAuthInProgress()) {
-      status_label->assign(kSyncAuthenticatingLabel);
+      status_label->assign(l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
       result_type = PRE_SYNCED;
     } else if (auth_error != AUTH_ERROR_NONE) {
       GetLabelsForAuthError(auth_error, service, status_label, link_label);
@@ -85,18 +87,21 @@ SyncStatusUIHelper::MessageType SyncStatusUIHelper::GetLabels(
     if (service->SetupInProgress()) {
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       AuthErrorState auth_error(service->GetAuthErrorState());
-      status_label->assign(UTF8ToWide(kSettingUpText));
+      status_label->assign(
+          l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS));
       if (service->UIShouldDepictAuthInProgress()) {
-        status_label->assign(kSyncAuthenticatingLabel);
+        status_label->assign(
+            l10n_util::GetString(IDS_SYNC_AUTHENTICATING_LABEL));
       } else if (auth_error != AUTH_ERROR_NONE) {
         status_label->clear();
         GetLabelsForAuthError(auth_error, service, status_label, NULL);
         result_type = SYNC_ERROR;
       } else if (!status.authenticated) {
-        status_label->assign(kSyncCredentialsNeededLabel);
+        status_label->assign(
+            l10n_util::GetString(IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED));
       }
     } else {
-      status_label->assign(kSyncNotSetupInfo);
+      status_label->assign(l10n_util::GetString(IDS_SYNC_NOT_SET_UP_INFO));
     }
   }
   return result_type;
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 56386fc..6c957f7 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -1889,16 +1888,16 @@ bool BookmarkBarView::ShouldShowSyncErrorButton() {
 
 views::TextButton* BookmarkBarView::CreateSyncErrorButton() {
   views::TextButton* sync_error_button =
-      new views::TextButton(this, kBookmarkBarSyncErrorButtonText);
+      new views::TextButton(this,
+              l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR));
   sync_error_button->set_tag(kSyncErrorButtonTag);
 
   // The tooltip is the only way we have to display text explaining the error
   // to the user.
-  sync_error_button->SetTooltipText(kBookmarkBarErrorTooltip);
-
-  // TODO(idana): set an appropriate accessible name when the personalization
-  // strings are moved to the .GRD file.
-  sync_error_button->SetAccessibleName(kBookmarkBarErrorTooltip);
+  sync_error_button->SetTooltipText(
+      l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
+  sync_error_button->SetAccessibleName(
+      l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 4a1c932..81bfeef 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/sync/sync_status_ui_helper.h"
 #include "chrome/browser/views/clear_browsing_data.h"
 #include "chrome/browser/views/importer_view.h"
@@ -445,9 +444,7 @@ void ContentPageView::InitSyncGroup() {
   layout->AddView(sync_start_stop_button_);
 
   sync_group_ = new OptionsGroupView(contents,
-                                     kSyncGroupName,
-                                     std::wstring(),
-                                     true);
+      l10n_util::GetString(IDS_SYNC_OPTIONS_GROUP_NAME), std::wstring(), true);
 }
 
 void ContentPageView::UpdateSyncControls() {
@@ -458,9 +455,13 @@ void ContentPageView::UpdateSyncControls() {
   bool sync_setup_completed = sync_service_->HasSyncSetupCompleted();
   bool status_has_error = SyncStatusUIHelper::GetLabels(sync_service_,
       &status_label, &link_label) == SyncStatusUIHelper::SYNC_ERROR;
-  button_label = sync_setup_completed ? kStopSyncButtonLabel :
-                 sync_service_->SetupInProgress() ? UTF8ToWide(kSettingUpText)
-                 : kStartSyncButtonLabel;
+  if (sync_setup_completed) {
+    button_label = l10n_util::GetString(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
+  } else if (sync_service_->SetupInProgress()) {
+    button_label = l10n_util::GetString(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
+  } else {
+    button_label = l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL);
+  }
 
   sync_status_label_->SetText(status_label);
   sync_start_stop_button_->SetEnabled(!sync_service_->WizardIsVisible());
diff --git a/chrome/browser/views/sync/sync_setup_flow.h b/chrome/browser/views/sync/sync_setup_flow.h
index 1e22cf0..52bf32f 100644
--- a/chrome/browser/views/sync/sync_setup_flow.h
+++ b/chrome/browser/views/sync/sync_setup_flow.h
@@ -10,10 +10,11 @@
 #include <string>
 #include <vector>
 
+#include "app/l10n_util.h"
 #include "base/time.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/sync/personalization_strings.h"
 #include "chrome/browser/views/sync/sync_setup_wizard.h"
+#include "grit/generated_resources.h"
 
 class FlowHandler;
 class SyncSetupFlowContainer;
@@ -67,7 +68,7 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
 
   // HtmlDialogUIDelegate implementation.
   virtual std::wstring GetDialogTitle() const {
-    return kLoginDialogTitle;
+    return l10n_util::GetString(IDS_SYNC_LOGIN_DIALOG_TITLE);
   }
 
   // HtmlDialogUIDelegate implementation.
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index f7c3518..577ccfe 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -39,9 +39,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#ifdef CHROME_PERSONALIZATION
-#include "chrome/browser/sync/personalization_strings.h"
-#endif
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -1086,7 +1083,8 @@ void ToolbarView::CreateAppMenu() {
   app_menu_contents_->AddSeparator();
 #ifdef CHROME_PERSONALIZATION
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync)) {
-    app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, kMenuLabelStartSync);
+    app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS,
+                                l10n_util::GetString(IDS_SYNC_MENU_LABEL));
   }
 #endif
   app_menu_contents_->AddItemWithStringId(IDC_CLEAR_BROWSING_DATA,
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9b7b71e..af80925 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1704,7 +1704,6 @@
         'browser/sync/glue/model_associator.h',
         'browser/sync/glue/sync_backend_host.cc',
         'browser/sync/glue/sync_backend_host.h',
-        'browser/sync/personalization_strings.h',
         'browser/sync/profile_sync_service.cc',
         'browser/sync/profile_sync_service.h',
         'browser/sync/sync_status_ui_helper.cc',