summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chromium_strings.grd3
-rw-r--r--chrome/app/google_chrome_strings.grd3
-rw-r--r--chrome/browser/chromeos/login/network_screen.cc4
-rw-r--r--chrome/browser/chromeos/login/webui_login_display.cc2
-rw-r--r--chrome/browser/ui/views/update_recommended_message_box.cc2
-rw-r--r--chrome/browser/ui/webui/help/help_handler.cc4
-rw-r--r--chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc2
-rw-r--r--chrome/browser/ui/webui/uber/uber_ui.cc4
-rw-r--r--chrome/common/chrome_version_info.cc2
9 files changed, 18 insertions, 8 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index d3986b5..db47f71 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -215,6 +215,9 @@ be available for now. -->
<message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
Chromium OS
</message>
+ <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS application short name">
+ Chromium OS
+ </message>
</if>
<if expr="is_win">
<message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index f23fef3..baf8661 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -136,6 +136,9 @@ Chrome supports. -->
</message>
<if expr="pp_ifdef('chromeos')">
<message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
+ Google Chrome OS
+ </message>
+ <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS application short name">
Chrome OS
</message>
</if>
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 76523e1..03efe10 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.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.
@@ -124,7 +124,7 @@ void NetworkScreen::OnConnectionTimeout() {
actor_->ShowError(
l10n_util::GetStringFUTF16(
IDS_NETWORK_SELECTION_ERROR,
- l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME),
+ l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME),
network_id_));
}
}
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index 0c2709a..b1a82bd 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -99,7 +99,7 @@ void WebUILoginDisplay::ShowError(int error_msg_id,
switch (error_msg_id) {
case IDS_LOGIN_ERROR_AUTHENTICATING_HOSTED:
error_text = l10n_util::GetStringFUTF8(
- error_msg_id, l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
+ error_msg_id, l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME));
break;
case IDS_LOGIN_ERROR_CAPTIVE_PORTAL:
error_text = l10n_util::GetStringFUTF8(
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc
index 5585d1c..aee9446 100644
--- a/chrome/browser/ui/views/update_recommended_message_box.cc
+++ b/chrome/browser/ui/views/update_recommended_message_box.cc
@@ -32,7 +32,7 @@ void UpdateRecommendedMessageBox::Show(gfx::NativeWindow parent_window) {
UpdateRecommendedMessageBox::UpdateRecommendedMessageBox() {
const int kDialogWidth = 400;
#if defined(OS_CHROMEOS)
- const int kProductNameID = IDS_PRODUCT_OS_NAME;
+ const int kProductNameID = IDS_SHORT_PRODUCT_OS_NAME;
#else
const int kProductNameID = IDS_PRODUCT_NAME;
#endif
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 7b2fa3d..6ab1e71 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -124,7 +124,11 @@ void HelpHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
static L10nResources resources[] = {
{ "helpTitle", IDS_HELP_TITLE },
{ "aboutTitle", IDS_ABOUT_TAB_TITLE },
+#if defined(OS_CHROMEOS)
+ { "aboutProductTitle", IDS_PRODUCT_OS_NAME },
+#else
{ "aboutProductTitle", IDS_PRODUCT_NAME },
+#endif
{ "aboutProductDescription", IDS_ABOUT_PRODUCT_DESCRIPTION },
{ "relaunch", IDS_RELAUNCH_BUTTON },
{ "productName", IDS_PRODUCT_NAME },
diff --git a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc
index fc97763..484e598 100644
--- a/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc
@@ -205,7 +205,7 @@ ListValue* CrosLanguageOptionsHandler::GetLanguageList(
}
string16 CrosLanguageOptionsHandler::GetProductName() {
- return l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
+ return l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME);
}
void CrosLanguageOptionsHandler::SetApplicationLocale(
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 9dfb0bc..ae431a9 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -91,9 +91,9 @@ ChromeWebUIDataSource* CreateUberFrameHTMLSource(Profile* profile) {
source->add_resource_path("uber_frame.js", IDR_UBER_FRAME_JS);
source->set_default_resource(IDR_UBER_FRAME_HTML);
- // TODO(jhawkins): Attempt to get rid of IDS_PRODUCT_OS_NAME.
+ // TODO(jhawkins): Attempt to get rid of IDS_SHORT_PRODUCT_OS_NAME.
#if defined(OS_CHROMEOS)
- source->AddLocalizedString("shortProductName", IDS_PRODUCT_OS_NAME);
+ source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_OS_NAME);
#else
source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
#endif // defined(OS_CHROMEOS)
diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc
index b2d1dfc2..67f5bb7 100644
--- a/chrome/common/chrome_version_info.cc
+++ b/chrome/common/chrome_version_info.cc
@@ -119,7 +119,7 @@ std::string VersionInfo::OSType() const {
return "Mac OS X";
#elif defined(OS_CHROMEOS)
if (ui::ResourceBundle::HasSharedInstance())
- return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
+ return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME));
else
return "Chromium OS";
#elif defined(OS_LINUX)
generated by cgit v1.1 at 2025-05-13 11:01:29 +0000