diff options
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/cocoa/extension_install_prompt.mm b/chrome/browser/cocoa/extension_install_prompt.mm index d53fc19..71eb5e4 100644 --- a/chrome/browser/cocoa/extension_install_prompt.mm +++ b/chrome/browser/cocoa/extension_install_prompt.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -31,7 +31,7 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( [continueButton setKeyEquivalent:@""]; NSButton* cancelButton = [alert addButtonWithTitle:l10n_util::GetNSString( - IDS_EXTENSION_PROMPT_CANCEL_BUTTON)]; + IDS_CANCEL)]; [cancelButton setKeyEquivalent:@"\r"]; [alert setMessageText:l10n_util::GetNSStringF( diff --git a/chrome/browser/cocoa/repost_form_warning_mac.mm b/chrome/browser/cocoa/repost_form_warning_mac.mm index 0635e95..2ca64d8 100644 --- a/chrome/browser/cocoa/repost_form_warning_mac.mm +++ b/chrome/browser/cocoa/repost_form_warning_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -52,7 +52,7 @@ RepostFormWarningMac::RepostFormWarningMac( [alert_ addButtonWithTitle: l10n_util::GetNSStringWithFixup(IDS_HTTP_POST_WARNING_RESEND)]; [alert_ addButtonWithTitle: - l10n_util::GetNSStringWithFixup(IDS_HTTP_POST_WARNING_CANCEL)]; + l10n_util::GetNSStringWithFixup(IDS_CANCEL)]; [alert_ beginSheetModalForWindow:parent modalDelegate:delegate_.get() diff --git a/chrome/browser/gtk/repost_form_warning_gtk.cc b/chrome/browser/gtk/repost_form_warning_gtk.cc index 227e864..a518f1d 100644 --- a/chrome/browser/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/gtk/repost_form_warning_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -26,7 +26,7 @@ RepostFormWarningGtk::RepostFormWarningGtk( gtk_window_set_title(GTK_WINDOW(dialog_), l10n_util::GetStringUTF8(IDS_HTTP_POST_WARNING_TITLE).c_str()); gtk_util::AddButtonToDialog(dialog_, - l10n_util::GetStringUTF8(IDS_HTTP_POST_WARNING_CANCEL).c_str(), + l10n_util::GetStringUTF8(IDS_CANCEL).c_str(), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_util::AddButtonToDialog(dialog_, l10n_util::GetStringUTF8(IDS_HTTP_POST_WARNING_RESEND).c_str(), diff --git a/chrome/browser/views/extensions/extension_install_prompt.cc b/chrome/browser/views/extensions/extension_install_prompt.cc index 5f96256..7bbfa91 100644 --- a/chrome/browser/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/views/extensions/extension_install_prompt.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -96,7 +96,7 @@ class InstallDialogContent : public views::View, public views::DialogDelegate { else return l10n_util::GetString(IDS_EXTENSION_PROMPT_INSTALL_BUTTON); case MessageBoxFlags::DIALOGBUTTON_CANCEL: - return l10n_util::GetString(IDS_EXTENSION_PROMPT_CANCEL_BUTTON); + return l10n_util::GetString(IDS_CANCEL); default: NOTREACHED(); return L""; diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc index 2a6f810..6e64d81 100644 --- a/chrome/browser/views/repost_form_warning_view.cc +++ b/chrome/browser/views/repost_form_warning_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -60,8 +60,8 @@ std::wstring RepostFormWarningView::GetDialogButtonLabel( if (button == MessageBoxFlags::DIALOGBUTTON_OK) return l10n_util::GetString(IDS_HTTP_POST_WARNING_RESEND); if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) - return l10n_util::GetString(IDS_HTTP_POST_WARNING_CANCEL); - return L""; + return l10n_util::GetString(IDS_CANCEL); + return std::wstring(); } void RepostFormWarningView::DeleteDelegate() { |