summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 23:58:44 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 23:58:44 +0000
commitc6c0fa943799e9a8c3de16ea1c5f44686ef6b912 (patch)
tree69bbe79f9261d11f48819c3e2372db7fbd4ec57b /chrome
parent45b9eba19e8411908ae1fa4b2fc90a139fe5e07a (diff)
downloadchromium_src-c6c0fa943799e9a8c3de16ea1c5f44686ef6b912.zip
chromium_src-c6c0fa943799e9a8c3de16ea1c5f44686ef6b912.tar.gz
chromium_src-c6c0fa943799e9a8c3de16ea1c5f44686ef6b912.tar.bz2
Change a raw "Google Chrome" to $PRODUCT_NAME in generated_resources.grd.
BUG=no TEST=no Review URL: http://codereview.chromium.org/3817006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd2
-rw-r--r--chrome/browser/extensions/extensions_ui.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 91c57ad..30f29a5 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3822,7 +3822,7 @@ each locale. -->
Allow access to file URLs
</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">&lt;b&gt;</ph>Warning:<ph name="END_BOLD">&lt;/b&gt;</ph> Google Chrome cannot prevent extensions from recording your browsing history. To disable this extension in incognito mode, unselect this option.
+ <ph name="BEGIN_BOLD">&lt;b&gt;</ph>Warning:<ph name="END_BOLD">&lt;/b&gt;</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
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index cea5d38..586ec6f 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -146,7 +146,8 @@ void ExtensionsUIHTMLSource::StartDataRequest(const std::string& path,
localized_strings.SetString("allowFileAccess",
l10n_util::GetStringUTF16(IDS_EXTENSIONS_ALLOW_FILE_ACCESS));
localized_strings.SetString("incognitoWarning",
- l10n_util::GetStringUTF16(IDS_EXTENSIONS_INCOGNITO_WARNING));
+ l10n_util::GetStringFUTF16(IDS_EXTENSIONS_INCOGNITO_WARNING,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
localized_strings.SetString("reload",
l10n_util::GetStringUTF16(IDS_EXTENSIONS_RELOAD));
localized_strings.SetString("uninstall",