diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:29:01 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:29:01 +0000 |
commit | ca3759f4c2dd733f38583816bbf4047f4333dcfb (patch) | |
tree | f551f60b4e69e3920556e09b892a4319ada1278e | |
parent | 1050fa5c4d97d0038e9b94a846234d8a0535bd3d (diff) | |
download | chromium_src-ca3759f4c2dd733f38583816bbf4047f4333dcfb.zip chromium_src-ca3759f4c2dd733f38583816bbf4047f4333dcfb.tar.gz chromium_src-ca3759f4c2dd733f38583816bbf4047f4333dcfb.tar.bz2 |
correct casing on some extensions strings
mostly for the page action context menu, but also used elsewhere such as panels
BUG=106781
TEST=on win/chromeos, sentence case. Elsewhere, title.
Review URL: https://chromiumcodereview.appspot.com/9289037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119779 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 42 insertions, 17 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index b37a871..e543d5d 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4183,9 +4183,6 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME To use this extension, type "<ph name="EXTENSION_KEYWORD">$1<ex>search</ex></ph>", then TAB, then your command or search. </message> - <message name="IDS_MANAGE_EXTENSIONS" desc="The 'Manage Extensions...' text in the context menu for when right-clicking on extension icons"> - Manage extensions... - </message> <message name="IDS_EXTENSION_INSTALLED_MANAGE_INFO" desc="Text displayed in the InfoBubble with instructions on how to find the chrome://extensions/ management page"> Manage your extensions by clicking Extensions in the Tools menu. </message> @@ -4239,9 +4236,6 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME <message name="IDS_EXTENSIONS_INSPECT_VIEWS" desc="The text for the label in front of the links to inspect active views."> Inspect active views: </message> - <message name="IDS_EXTENSIONS_DISABLE" desc="The link for disabling an extension."> - Disable - </message> <message name="IDS_EXTENSIONS_ENABLE" desc="The link for enabling extensions."> Enable </message> @@ -4263,18 +4257,48 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME <message name="IDS_EXTENSIONS_RELOAD" desc="The link for reloading extensions."> Reload </message> - <message name="IDS_EXTENSIONS_OPTIONS" desc="The button text for the options button."> + <message name="IDS_EXTENSIONS_OPTIONS_LINK" desc="The button text for the options button."> Options </message> <message name="IDS_EXTENSIONS_SHOW_BUTTON" desc="The text for the Show link."> Show button </message> - <message name="IDS_EXTENSIONS_HIDE_BUTTON" desc="The text for the Hide context menu item."> - Hide button - </message> - <message name="IDS_EXTENSION_ACTION_INSPECT_POPUP" desc="The text for the right-click menu of page and browser actions which shows the popup and opens the developer tools."> - Inspect popup - </message> + + <if expr="not pp_ifdef('use_titlecase')"> + <message name="IDS_EXTENSIONS_OPTIONS_MENU_ITEM" desc="The text for the options menu item in context menus (sentence case)."> + Options + </message> + <message name="IDS_EXTENSIONS_DISABLE" desc="The link for disabling an extension (sentence case)."> + Disable + </message> + <message name="IDS_EXTENSIONS_HIDE_BUTTON" desc="The text for the Hide context menu item (sentence case)."> + Hide button + </message> + <message name="IDS_MANAGE_EXTENSIONS" desc="The 'Manage Extensions...' text in the context menu for when right-clicking on extension icons (sentence case)."> + Manage extensions... + </message> + <message name="IDS_EXTENSION_ACTION_INSPECT_POPUP" desc="The text for the right-click menu of page and browser actions which shows the popup and opens the developer tools (sentence case)."> + Inspect popup + </message> + </if> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_EXTENSIONS_OPTIONS_MENU_ITEM" desc="The text for the options menu item in context menus (title case)."> + Options + </message> + <message name="IDS_EXTENSIONS_DISABLE" desc="The link for disabling an extension (title case)."> + Disable + </message> + <message name="IDS_EXTENSIONS_HIDE_BUTTON" desc="The text for the Hide context menu item (title case)."> + Hide Button + </message> + <message name="IDS_MANAGE_EXTENSIONS" desc="The 'Manage Extensions...' text in the context menu for when right-clicking on extension icons (title case)."> + Manage Extensions... + </message> + <message name="IDS_EXTENSION_ACTION_INSPECT_POPUP" desc="The text for the right-click menu of page and browser actions which shows the popup and opens the developer tools (title case)."> + Inspect Popup + </message> + </if> + <message name="IDS_EXTENSIONS_POLICY_CONTROLLED" desc="The text informing the user that an extension is policy controlled"> (this extension is managed and can not be removed or disabled) </message> diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index f926baa..c323ec8 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -68,7 +68,7 @@ void ExtensionContextMenuModel::InitCommonCommands() { AddItem(NAME, UTF8ToUTF16(extension->name())); AddSeparator(); - AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS); + AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM); AddItemWithStringId(DISABLE, IDS_EXTENSIONS_DISABLE); AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); if (extension->browser_action()) 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 6020d31..1b9a56d 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -172,7 +172,7 @@ int CurrentTabId() { NSArray* menuItems = [NSArray arrayWithObjects: base::SysUTF8ToNSString(extension->name()), [NSMenuItem separatorItem], - l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_OPTIONS), + l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_OPTIONS_MENU_ITEM), l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_DISABLE), l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_UNINSTALL), l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_HIDE_BUTTON), diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.cc b/chrome/browser/ui/panels/panel_settings_menu_model.cc index dbd8a6b..922c232 100644 --- a/chrome/browser/ui/panels/panel_settings_menu_model.cc +++ b/chrome/browser/ui/panels/panel_settings_menu_model.cc @@ -27,7 +27,8 @@ PanelSettingsMenuModel::PanelSettingsMenuModel(Panel* panel) AddItem(COMMAND_NAME, UTF8ToUTF16(extension->name())); AddSeparator(); - AddItem(COMMAND_CONFIGURE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS)); + AddItem(COMMAND_CONFIGURE, + l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_MENU_ITEM)); AddItem(COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE)); AddItem(COMMAND_UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index cf99cb2..f439cf9 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -547,7 +547,7 @@ void ExtensionSettingsHandler::GetLocalizedValues( localized_strings->SetString("extensionSettingsReload", l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD)); localized_strings->SetString("extensionSettingsOptions", - l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS)); + l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK)); localized_strings->SetString("extensionSettingsPolicyControlled", l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED)); localized_strings->SetString("extensionSettingsShowButton", |