diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 01:35:49 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 01:35:49 +0000 |
| commit | ddf5209ff75d2eeb5cba93152e217fec56188c89 (patch) | |
| tree | 5f67e63baf4efa2ca639d7628bd5f808743d8eee /chrome/browser/ui | |
| parent | faca14f13afee818cfcefd91734f44da98e91b18 (diff) | |
| download | chromium_src-ddf5209ff75d2eeb5cba93152e217fec56188c89.zip chromium_src-ddf5209ff75d2eeb5cba93152e217fec56188c89.tar.gz chromium_src-ddf5209ff75d2eeb5cba93152e217fec56188c89.tar.bz2 | |
Revert 102834 - Revert 102806 - [Sync Setup UI] String changes. "Sync" -> "Sign In" and others.
I was asked to revert this by a sheriff on a failing mac test, but I've successfully retried, so I think it was flake.
BUG=93176, 97523
TEST=manual
Review URL: http://codereview.chromium.org/7977029
TBR=binji@chromium.org
Review URL: http://codereview.chromium.org/8028049
TBR=binji@chromium.org
Review URL: http://codereview.chromium.org/8143010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/options/personal_options_handler.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/stop_syncing_handler.cc | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 30e574d..2127495 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -17,6 +17,7 @@ #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" @@ -78,13 +79,12 @@ void PersonalOptionsHandler::GetLocalizedValues( "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)); @@ -265,7 +265,8 @@ void PersonalOptionsHandler::OnStateChanged() { 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; } diff --git a/chrome/browser/ui/webui/options/stop_syncing_handler.cc b/chrome/browser/ui/webui/options/stop_syncing_handler.cc index 79e5568e..2aed31a 100644 --- a/chrome/browser/ui/webui/options/stop_syncing_handler.cc +++ b/chrome/browser/ui/webui/options/stop_syncing_handler.cc @@ -24,7 +24,8 @@ void StopSyncingHandler::GetLocalizedValues( DictionaryValue* localized_strings) { DCHECK(localized_strings); localized_strings->SetString("stopSyncingExplanation", - l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL)); + l10n_util::GetStringFUTF16(IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL, + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); localized_strings->SetString("stopSyncingTitle", l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_DIALOG_TITLE)); localized_strings->SetString("stopSyncingConfirm", |