Use real language for extension alert.

BUG=94494
TEST=manual; looked for typos and asked rahulrc for existing docs to borrow language.


Review URL: http://codereview.chromium.org/8298013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105845 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 18 insertions, 22 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 11c7329..56e8df8 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3770,26 +3770,23 @@ are declared in build/common.gypi.
         The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has requested additional permissions.
       </message>
 
-      <!-- Extension notifications. ALL THIS TEXT IS PLACEHOLDER. TODO(miket) -->
-      <message name="IDS_EXTENSION_NOTIFICATION_TITLE" desc="Titlebar of the extension notification alert PLACEHOLDER NOT READY FOR I18N">
-        Changes to your extensions
+      <!-- Extension alerts. -->
+      <message name="IDS_EXTENSION_ALERT_TITLE" desc="Titlebar of the extension notification alert">
+        Confirm Changes
       </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_BODY_TEMPLATE" desc="The first part of the text in the extension notification alert PLACEHOLDER NOT READY FOR I18N">
-	Hey! Pay attention!\n\n<ph name="INNER_BODY">$1<ex>Something interesting happened!</ex></ph>\nThat's all! Back to work!
+      <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 installed.\n
       </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_ITEM_EXTERNAL" desc="A description of a newly installed external extension PLACEHOLDER NOT READY FOR I18N">
-	A new extension called "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been installed.\n
+      <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&amp;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.\n
       </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_ITEM_BLACKLISTED" desc="A description of a newly installed external extension PLACEHOLDER NOT READY FOR I18N">
-	One of your extensions, called "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>," has been blacklisted.\n
+      <message name="IDS_EXTENSION_ALERT_ITEM_ORPHANED" desc="A statement that an extension formerly live in the App Store has been delisted.">
+	Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>."\n
       </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_ITEM_ORPHANED" desc="A description of a newly installed external extension PLACEHOLDER NOT READY FOR I18N">
-	Update checks have repeatedly failed for one of your extensions, called "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>."\n
-      </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_ITEM_OK" desc="The title of the default button acknowledging the information presented. PLACEHOLDER NOT READY FOR I18N">
+      <message name="IDS_EXTENSION_ALERT_ITEM_OK" desc="The title of the default button acknowledging the information presented.">
 	OK
       </message>
-      <message name="IDS_EXTENSION_NOTIFICATION_ITEM_DETAILS" desc="The title of the button asking for more information. PLACEHOLDER NOT READY FOR I18N">
+      <message name="IDS_EXTENSION_ALERT_ITEM_DETAILS" desc="The title of the button asking for more information.">
 	Details
       </message>
 
diff --git a/chrome/browser/extensions/extension_global_error.cc b/chrome/browser/extensions/extension_global_error.cc
index c421119..ca1cb58 100644
--- a/chrome/browser/extensions/extension_global_error.cc
+++ b/chrome/browser/extensions/extension_global_error.cc
@@ -84,7 +84,7 @@ void ExtensionGlobalError::ShowBubbleView(Browser* browser) {
 }
 
 string16 ExtensionGlobalError::GetBubbleViewTitle() {
-  return l10n_util::GetStringUTF16(IDS_EXTENSION_NOTIFICATION_TITLE);
+  return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_TITLE);
 }
 
 string16 ExtensionGlobalError::GenerateMessageSection(
@@ -105,14 +105,13 @@ string16 ExtensionGlobalError::GenerateMessageSection(
 
 string16 ExtensionGlobalError::GenerateMessage() {
   if (extension_service_.get()) {
-    return l10n_util::GetStringFUTF16(
-        IDS_EXTENSION_NOTIFICATION_BODY_TEMPLATE,
+    return
         GenerateMessageSection(external_extension_ids_.get(),
-                               IDS_EXTENSION_NOTIFICATION_ITEM_EXTERNAL) +
+                               IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
         GenerateMessageSection(blacklisted_extension_ids_.get(),
-                               IDS_EXTENSION_NOTIFICATION_ITEM_EXTERNAL) +
+                               IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
         GenerateMessageSection(orphaned_extension_ids_.get(),
-                               IDS_EXTENSION_NOTIFICATION_ITEM_EXTERNAL));
+                               IDS_EXTENSION_ALERT_ITEM_EXTERNAL);
   } else {
     return string16();
   }
@@ -126,11 +125,11 @@ string16 ExtensionGlobalError::GetBubbleViewMessage() {
 }
 
 string16 ExtensionGlobalError::GetBubbleViewAcceptButtonLabel() {
-  return l10n_util::GetStringUTF16(IDS_EXTENSION_NOTIFICATION_ITEM_OK);
+  return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_OK);
 }
 
 string16 ExtensionGlobalError::GetBubbleViewCancelButtonLabel() {
-  return l10n_util::GetStringUTF16(IDS_EXTENSION_NOTIFICATION_ITEM_DETAILS);
+  return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_DETAILS);
 }
 
 void ExtensionGlobalError::BubbleViewDidClose() {