diff options
14 files changed, 71 insertions, 57 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index d111907..17b94b5 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -575,6 +575,30 @@ Chromium is unable to recover your settings. </message> </if> + <!-- Extension/App install prompt --> + <message name="IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE" desc="Titlebar of the extension or app inline installation prompt window"> + Add to Chromium + </message> + + <!-- Extension alerts. --> + <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions."> +The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added to Chromium. +''' + </message> + + <!-- Extension installed bubble --> + <message name="IDS_EXTENSION_INSTALLED_HEADING" desc="First line in the content area of the extension installed bubble. Instructs that the extension was installed."> + <ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph> has been added to Chromium. + </message> + + <!-- chrome://settings/extensions page --> + <message name="IDS_EXTENSIONS_INCOGNITO_WARNING" desc="Warns the user that Chromium cannot prevent extensions from recording history in incognito mode. Displayed in extensions management UI after an extension is selected to be run in incognito mode."> + <ph name="BEGIN_BOLD"><b></ph>Warning:<ph name="END_BOLD"></b></ph> Chromium cannot prevent extensions from recording your browsing history. To disable this extension in incognito mode, unselect this option. + </message> + <message name="IDS_EXTENSIONS_UNINSTALL" desc="The link for uninstalling extensions."> + Remove from Chromium + </message> + <if expr="is_macosx"> <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome."> Chromium diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index c67c7b7..3eaa668 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3935,9 +3935,6 @@ Public Exponent (<ph name="PUBLIC_EXPONENT_NUM_BITS">$3<ex>24</ex></ph> bits): <message name="IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE" desc="Titlebar of the extension or app installation prompt window"> Confirm New Extension </message> - <message name="IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE" desc="Titlebar of the extension or app inline installation prompt window"> - Add to <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> - </message> <message name="IDS_EXTENSION_UNINSTALL_PROMPT_TITLE" desc="Titlebar of the extension or app uninstallation prompt window"> Confirm Removal </message> @@ -3964,10 +3961,6 @@ Public Exponent (<ph name="PUBLIC_EXPONENT_NUM_BITS">$3<ex>24</ex></ph> bits): <message name="IDS_EXTENSION_ALERT_TITLE" desc="Titlebar of the extension notification alert"> Confirm Changes </message> - <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions."> -The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added to <ph name="PRODUCT_NAME_SHORT">$1<ex>Chrome</ex></ph>. -''' - </message> <message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED" desc="A statement that an extension has been newly blacklisted. http://www.google.com/support/chrome/bin/answer.py?hl=en&answer=1210215 contains the language on which we're basing the phrasing."> The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically removed. ''' @@ -4192,10 +4185,6 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME </message> <!-- Extension installed bubble --> - <message name="IDS_EXTENSION_INSTALLED_HEADING" desc="First line in the content area of the extension installed bubble. Instructs that the extension was installed."> - <ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph> has been added to <ph name="SHORT_PRODUCT_NAME">$2<ex>Chrome</ex></ph>. - </message> - <message name="IDS_EXTENSION_INSTALLED_APP_INFO" desc="Text displayed inside a link when an app is installed. Clicking this link opens up the New Tab Page to show the app's icon."> Show me </message> @@ -4284,15 +4273,9 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME <message name="IDS_EXTENSIONS_VISIT_WEBSITE" desc="The link for visiting the extension's gallery page."> View in Web Store </message> - <message name="IDS_EXTENSIONS_INCOGNITO_WARNING" desc="Warns the user that Chrome cannot prevent extensions from recording history in incognito mode. Displayed in extensions management UI after an extension is selected to be run in incognito mode."> - <ph name="BEGIN_BOLD"><b></ph>Warning:<ph name="END_BOLD"></b></ph> <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cannot prevent extensions from recording your browsing history. To disable this extension in incognito mode, unselect this option. - </message> <message name="IDS_EXTENSIONS_RELOAD" desc="The link for reloading extensions."> Reload </message> - <message name="IDS_EXTENSIONS_UNINSTALL" desc="The link for uninstalling extensions."> - Remove from <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> - </message> <message name="IDS_EXTENSIONS_OPTIONS" desc="The button text for the options button."> Options </message> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index a10c26c..b104b24 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -550,6 +550,30 @@ Google Chrome is unable to recover your settings. </message> </if> + <!-- Extension/App install prompt --> + <message name="IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE" desc="Titlebar of the extension or app inline installation prompt window"> + Add to Chrome + </message> + + <!-- Extension alerts. --> + <message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions."> +The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added to Chrome. +''' + </message> + + <!-- Extension installed bubble --> + <message name="IDS_EXTENSION_INSTALLED_HEADING" desc="First line in the content area of the extension installed bubble. Instructs that the extension was installed."> + <ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph> has been added to Chrome. + </message> + + <!-- chrome://settings/extensions page --> + <message name="IDS_EXTENSIONS_INCOGNITO_WARNING" desc="Warns the user that Chrome cannot prevent extensions from recording history in incognito mode. Displayed in extensions management UI after an extension is selected to be run in incognito mode."> + <ph name="BEGIN_BOLD"><b></ph>Warning:<ph name="END_BOLD"></b></ph> Google Chrome cannot prevent extensions from recording your browsing history. To disable this extension in incognito mode, unselect this option. + </message> + <message name="IDS_EXTENSIONS_UNINSTALL" desc="The link for uninstalling extensions."> + Remove from Chrome + </message> + <if expr="is_macosx"> <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome."> Chrome diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 79a9d8f..f926baa 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -70,8 +70,7 @@ void ExtensionContextMenuModel::InitCommonCommands() { AddSeparator(); AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS); AddItemWithStringId(DISABLE, IDS_EXTENSIONS_DISABLE); - AddItem(UNINSTALL, l10n_util::GetStringFUTF16(IDS_EXTENSIONS_UNINSTALL, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); + AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); if (extension->browser_action()) AddItemWithStringId(HIDE, IDS_EXTENSIONS_HIDE_BUTTON); AddSeparator(); diff --git a/chrome/browser/extensions/extension_global_error.cc b/chrome/browser/extensions/extension_global_error.cc index 26c5376..f499317 100644 --- a/chrome/browser/extensions/extension_global_error.cc +++ b/chrome/browser/extensions/extension_global_error.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -98,10 +98,8 @@ string16 ExtensionGlobalError::GenerateMessageSection( for (ExtensionIdSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { const Extension* e = extension_service_->GetExtensionById(*iter, true); - message += l10n_util::GetStringFUTF16( - template_message_id, - string16(ASCIIToUTF16(e->name())), - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); + message += l10n_util::GetStringFUTF16(template_message_id, + string16(ASCIIToUTF16(e->name()))); } return message; } diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 6cbe565..1ae8529 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -111,9 +111,6 @@ string16 ExtensionInstallUI::Prompt::GetDialogTitle( return l10n_util::GetStringUTF16(extension->is_app() ? IDS_EXTENSION_INSTALL_APP_PROMPT_TITLE : IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE); - } else if (type_ == INLINE_INSTALL_PROMPT) { - return l10n_util::GetStringFUTF16( - kTitleIds[type_], l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); } else { return l10n_util::GetStringUTF16(kTitleIds[type_]); } diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index ea45d80..6020d31 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -174,9 +174,7 @@ int CurrentTabId() { [NSMenuItem separatorItem], l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_OPTIONS), l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_DISABLE), - l10n_util::GetNSStringFWithFixup( - IDS_EXTENSIONS_UNINSTALL, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)), + l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_UNINSTALL), l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_HIDE_BUTTON), [NSMenuItem separatorItem], l10n_util::GetNSStringWithFixup(IDS_MANAGE_EXTENSIONS), diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm index bf4039d..1639f73 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -38,12 +38,11 @@ static void ShowGenericExtensionInstalledInfoBar( string16 extension_name = UTF8ToUTF16(new_extension->name()); base::i18n::AdjustStringForLocaleDirection(&extension_name); - string16 msg = l10n_util::GetStringFUTF16( - IDS_EXTENSION_INSTALLED_HEADING, - extension_name, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)) + - UTF8ToUTF16(" ") + - l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO_MAC); + string16 msg = l10n_util::GetStringFUTF16(IDS_EXTENSION_INSTALLED_HEADING, + extension_name) + + UTF8ToUTF16(" ") + + l10n_util::GetStringUTF16( + IDS_EXTENSION_INSTALLED_MANAGE_INFO_MAC); InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper(); InfoBarDelegate* delegate = new SimpleAlertInfoBarDelegate( infobar_helper, new gfx::Image(new SkBitmap(icon)), msg, true); diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index cc4088d..caf502bd 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -305,8 +305,7 @@ class ExtensionLoadedNotificationObserver string16 extension_name = UTF8ToUTF16(extension_->name().c_str()); base::i18n::AdjustStringForLocaleDirection(&extension_name); [extensionInstalledMsg_ setStringValue:l10n_util::GetNSStringF( - IDS_EXTENSION_INSTALLED_HEADING, extension_name, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))]; + IDS_EXTENSION_INSTALLED_HEADING, extension_name)]; [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:extensionInstalledMsg_]; newWindowHeight += [extensionInstalledMsg_ frame].size.height + diff --git a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc index bdec27f..e992b23 100644 --- a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc @@ -223,8 +223,7 @@ void ExtensionInstalledBubbleGtk::ShowInternal() { string16 extension_name = UTF8ToUTF16(extension_->name()); base::i18n::AdjustStringForLocaleDirection(&extension_name); std::string heading_text = l10n_util::GetStringFUTF8( - IDS_EXTENSION_INSTALLED_HEADING, extension_name, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); + IDS_EXTENSION_INSTALLED_HEADING, extension_name); char* markup = g_markup_printf_escaped("<span size=\"larger\">%s</span>", heading_text.c_str()); gtk_label_set_markup(GTK_LABEL(heading_label), markup); diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.cc b/chrome/browser/ui/panels/panel_settings_menu_model.cc index 6e36c04..dbd8a6b 100644 --- a/chrome/browser/ui/panels/panel_settings_menu_model.cc +++ b/chrome/browser/ui/panels/panel_settings_menu_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -30,8 +30,7 @@ PanelSettingsMenuModel::PanelSettingsMenuModel(Panel* panel) AddItem(COMMAND_CONFIGURE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS)); AddItem(COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE)); AddItem(COMMAND_UNINSTALL, - l10n_util::GetStringFUTF16(IDS_EXTENSIONS_UNINSTALL, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); AddSeparator(); AddItem(COMMAND_MANAGE, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS)); } diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index e53203f..5af242d 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -114,9 +114,7 @@ class InstalledBubbleContent : public views::View, string16 extension_name = UTF8ToUTF16(extension->name()); base::i18n::AdjustStringForLocaleDirection(&extension_name); heading_ = new views::Label(l10n_util::GetStringFUTF16( - IDS_EXTENSION_INSTALLED_HEADING, - extension_name, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); + IDS_EXTENSION_INSTALLED_HEADING, extension_name)); heading_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); heading_->SetMultiLine(true); heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index deeff2f..f8ed702 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -308,9 +308,7 @@ void NTPResourceCache::CreateNewTabHTML() { localized_strings.SetString("removethumbnailtooltip", l10n_util::GetStringUTF16(IDS_NEW_TAB_REMOVE_THUMBNAIL_TOOLTIP)); localized_strings.SetString("appuninstall", - l10n_util::GetStringFUTF16( - IDS_EXTENSIONS_UNINSTALL, - l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); localized_strings.SetString("appoptions", l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_OPTIONS)); localized_strings.SetString("appdisablenotifications", diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index f63f03d..1e0e1dee 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -545,8 +545,7 @@ void ExtensionSettingsHandler::GetLocalizedValues( localized_strings->SetString("extensionSettingsAllowFileAccess", l10n_util::GetStringUTF16(IDS_EXTENSIONS_ALLOW_FILE_ACCESS)); localized_strings->SetString("extensionSettingsIncognitoWarning", - l10n_util::GetStringFUTF16(IDS_EXTENSIONS_INCOGNITO_WARNING, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_INCOGNITO_WARNING)); localized_strings->SetString("extensionSettingsReload", l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD)); localized_strings->SetString("extensionSettingsOptions", |