Adding strings for new TMP information dialog

BUG=chromium-os:7134
TEST=none

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

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

2 files changed, 14 insertions, 1 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5293296..48ee765 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8899,7 +8899,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
         System security setting
       </message>
       <message name="IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION" desc="Dialog box text">
-        Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS.\n\nBelow is the randomly generated TPM password that has been assigned to your computer:
+        Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS.
+      </message>
+      <message name="IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY" desc="Dialog box text">
+        Below is the randomly generated TPM password that has been assigned to your computer:
+      </message>
+      <message name="IDS_EULA_SYSTEM_SECURITY_SETTING_WAIT" desc="Dialog box text">
+       The TPM is being set up. Please be patient; this may take a few minutes.
       </message>
       <message name="IDS_EULA_TPM_BUSY" desc="Message bubble text">
         TPM is not ready yet, try later.
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index d9c9b4d..b87bae9 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -122,6 +122,13 @@ void TpmInfoView::Init() {
   layout->AddView(label);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
+  layout->StartRow(0, 0);
+  label = new views::Label(
+      l10n_util::GetString(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION_KEY));
+  label->SetMultiLine(true);
+  layout->AddView(label);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+
   column_set = layout->AddColumnSet(1);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);