improve translateability of some OOBE strings

BUG=111425, 160586

Review URL: https://codereview.chromium.org/376733005

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

chrome/app/chromeos_strings.grdp

@@ -1157,9 +1157,6 @@ Press any key to continue exploring.
   <message name="IDS_UPDATE_COMPLETED" desc="Notification for update completed">
     System update complete. Please restart the system.
   </message>
-  <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates installation screen during OOBE">
-    Please wait while <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> installs the latest system updates.
-  </message>
   <message name="IDS_INSTALLING_UPDATE_DESC" desc="Additional info shown on the updates installation screen during OOBE">
     Your computer will restart when the update is complete.
   </message>
@@ -1190,12 +1187,6 @@ Press any key to continue exploring.
   <message name="IDS_UPDATE_CANCELLED" desc="Message shown when the update has been cancelled by user">
     Cancelling update...
   </message>
-  <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: message shown during checking for update stage.">
-    <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> updates automatically so you always have the freshest version.
-  </message>
-  <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown during update stage.">
-    <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> updates automatically so you always have the freshest version. When this download completes, <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> will restart and you'll be on your way.
-  </message>
   <message name="IDS_REMORA_CONFIRM_MESSAGE" desc="Remora confirm message on the first OOBE screen">
     Chromebox for Meetings device is ready to be set up.
   </message>
@@ -1211,9 +1202,6 @@ Press any key to continue exploring.
   <message name="IDS_EULA_SCREEN_TITLE" desc="Title of the OOBE EULA screen">
     The small print
   </message>
-  <message name="IDS_EULA_SCREEN_ACCESSIBLE_TITLE" desc="Title to be spoken on opening the OOBE EULA screen">
-    <ph name="PRODUCT_OS_NAME">$1<ex>Chrome OS</ex></ph> terms
-  </message>
   <message name="IDS_AUTOSTART_WARNING_TITLE" desc="Title of the kiosk autostart screen">
     Auto-launch permission requested
   </message>

chrome/app/chromium_strings.grd

@@ -1258,6 +1258,22 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
         </message>
       </if>
 
+      <!-- OOBE -->
+      <if expr="chromeos">
+        <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates installation screen during OOBE">
+          Please wait while Chromium installs the latest system updates.
+        </message>
+        <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: message shown during checking for update stage.">
+          Chromium updates automatically so you always have the freshest version.
+        </message>
+        <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown during update stage.">
+          Chromium updates automatically so you always have the freshest version. When this download completes, Chromium will restart and you'll be on your way.
+        </message>
+        <message name="IDS_EULA_SCREEN_ACCESSIBLE_TITLE" desc="Title to be spoken on opening the OOBE EULA screen">
+          Chromium OS terms
+        </message>
+      </if>
+
     </messages>
   </release>
 </grit>

chrome/app/google_chrome_strings.grd

@@ -1183,6 +1183,22 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
         </message>
       </if>
 
+      <!-- OOBE -->
+      <if expr="chromeos">
+        <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates installation screen during OOBE">
+          Please wait while Chrome installs the latest system updates.
+        </message>
+        <message name="IDS_CHECKING_FOR_UPDATE_MSG" desc="Chrome OS OOBE: message shown during checking for update stage.">
+          Chrome updates automatically so you always have the freshest version.
+        </message>
+        <message name="IDS_UPDATE_MSG" desc="Chrome OS OOBE: message shown during update stage.">
+          Chrome updates automatically so you always have the freshest version. When this download completes, Chrome will restart and you'll be on your way.
+        </message>
+        <message name="IDS_EULA_SCREEN_ACCESSIBLE_TITLE" desc="Title to be spoken on opening the OOBE EULA screen">
+          Chrome OS terms
+        </message>
+      </if>
+
     </messages>
   </release>
 </grit>

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

@@ -114,9 +114,7 @@ void EulaScreenHandler::SetDelegate(Delegate* delegate) {
 void EulaScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
   builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE);
-  builder->AddF("eulaScreenAccessibleTitle",
-                IDS_EULA_SCREEN_ACCESSIBLE_TITLE,
-                IDS_PRODUCT_OS_NAME);
+  builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE);
   builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING);
   builder->Add("back", IDS_EULA_BACK_BUTTON);
   builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON);

chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc

@@ -32,11 +32,8 @@ UpdateScreenHandler::~UpdateScreenHandler() {
 
 void UpdateScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
-  builder->AddF("checkingForUpdatesMsg",
-                IDS_CHECKING_FOR_UPDATE_MSG, IDS_SHORT_PRODUCT_NAME);
-  builder->AddF("installingUpdateDesc",
-                IDS_UPDATE_MSG, IDS_SHORT_PRODUCT_NAME);
-
+  builder->Add("checkingForUpdatesMsg", IDS_CHECKING_FOR_UPDATE_MSG);
+  builder->Add("installingUpdateDesc", IDS_UPDATE_MSG);
   builder->Add("updateScreenTitle", IDS_UPDATE_SCREEN_TITLE);
   builder->Add("updateScreenAccessibleTitle",
                IDS_UPDATE_SCREEN_ACCESSIBLE_TITLE);
@@ -107,30 +104,26 @@ void UpdateScreenHandler::ShowProgressMessage(bool visible) {
 }
 
 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
-  scoped_ptr<base::StringValue> progress_message;
+  int ids = 0;
   switch (message) {
     case PROGRESS_MESSAGE_UPDATE_AVAILABLE:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
+      ids = IDS_UPDATE_AVAILABLE;
       break;
     case PROGRESS_MESSAGE_INSTALLING_UPDATE:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringFUTF16(IDS_INSTALLING_UPDATE,
-            l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))));
+      ids = IDS_INSTALLING_UPDATE;
       break;
     case PROGRESS_MESSAGE_VERIFYING:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_VERIFYING)));
+      ids = IDS_UPDATE_VERIFYING;
       break;
     case PROGRESS_MESSAGE_FINALIZING:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING)));
+      ids = IDS_UPDATE_FINALIZING;
       break;
     default:
       NOTREACHED();
-  };
-  if (progress_message.get())
-    CallJS("setProgressMessage", *progress_message);
+      return;
+  }
+
+  CallJS("setProgressMessage", l10n_util::GetStringUTF16(ids));
 }
 
 void UpdateScreenHandler::ShowCurtain(bool visible) {